commit | 535485485ae3df5c7931d83fbc154bee3678ad99 | [log] [tgz] |
---|---|---|
author | Michael Baessler <mbaessler@apache.org> | Tue Mar 11 08:27:23 2008 +0000 |
committer | Michael Baessler <mbaessler@apache.org> | Tue Mar 11 08:27:23 2008 +0000 |
tree | ed282f570e53afc2ce93e4e5f23341c84a866905 | |
parent | b967b977b100f7940edf23b281376d53f49c9f6e [diff] |
git-svn-id: https://svn.apache.org/repos/asf/incubator/uima/uimaj/tags/uimaj-2.2.1@635844 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/uimaj-2.2.1-06/jVinci/pom.xml b/uimaj-2.2.1-incubating/jVinci/pom.xml similarity index 100% rename from uimaj-2.2.1-06/jVinci/pom.xml rename to uimaj-2.2.1-incubating/jVinci/pom.xml
diff --git a/uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/debug/AssertionFailedException.java b/uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/debug/AssertionFailedException.java similarity index 100% rename from uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/debug/AssertionFailedException.java rename to uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/debug/AssertionFailedException.java
diff --git a/uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/debug/Debug.java b/uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/debug/Debug.java similarity index 100% rename from uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/debug/Debug.java rename to uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/debug/Debug.java
diff --git a/uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/debug/FatalException.java b/uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/debug/FatalException.java similarity index 100% rename from uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/debug/FatalException.java rename to uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/debug/FatalException.java
diff --git a/uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/Attributes.java b/uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/Attributes.java similarity index 100% rename from uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/Attributes.java rename to uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/Attributes.java
diff --git a/uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/BaseClient.java b/uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/BaseClient.java similarity index 100% rename from uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/BaseClient.java rename to uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/BaseClient.java
diff --git a/uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/BaseServer.java b/uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/BaseServer.java similarity index 100% rename from uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/BaseServer.java rename to uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/BaseServer.java
diff --git a/uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/BaseServerRunnable.java b/uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/BaseServerRunnable.java similarity index 100% rename from uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/BaseServerRunnable.java rename to uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/BaseServerRunnable.java
diff --git a/uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/ErrorFrame.java b/uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/ErrorFrame.java similarity index 100% rename from uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/ErrorFrame.java rename to uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/ErrorFrame.java
diff --git a/uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/Frame.java b/uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/Frame.java similarity index 100% rename from uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/Frame.java rename to uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/Frame.java
diff --git a/uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/FrameComponent.java b/uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/FrameComponent.java similarity index 100% rename from uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/FrameComponent.java rename to uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/FrameComponent.java
diff --git a/uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/FrameLeaf.java b/uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/FrameLeaf.java similarity index 100% rename from uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/FrameLeaf.java rename to uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/FrameLeaf.java
diff --git a/uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/FrameTransporter.java b/uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/FrameTransporter.java similarity index 100% rename from uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/FrameTransporter.java rename to uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/FrameTransporter.java
diff --git a/uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/KeyValuePair.java b/uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/KeyValuePair.java similarity index 100% rename from uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/KeyValuePair.java rename to uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/KeyValuePair.java
diff --git a/uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/LeafCastException.java b/uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/LeafCastException.java similarity index 100% rename from uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/LeafCastException.java rename to uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/LeafCastException.java
diff --git a/uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/PooledVinciClient.java b/uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/PooledVinciClient.java similarity index 100% rename from uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/PooledVinciClient.java rename to uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/PooledVinciClient.java
diff --git a/uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/QueryableFrame.java b/uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/QueryableFrame.java similarity index 100% rename from uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/QueryableFrame.java rename to uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/QueryableFrame.java
diff --git a/uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/ServiceDownException.java b/uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/ServiceDownException.java similarity index 100% rename from uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/ServiceDownException.java rename to uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/ServiceDownException.java
diff --git a/uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/ServiceException.java b/uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/ServiceException.java similarity index 100% rename from uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/ServiceException.java rename to uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/ServiceException.java
diff --git a/uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/SimpleTransportable.java b/uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/SimpleTransportable.java similarity index 100% rename from uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/SimpleTransportable.java rename to uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/SimpleTransportable.java
diff --git a/uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/TransportConstants.java b/uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/TransportConstants.java similarity index 100% rename from uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/TransportConstants.java rename to uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/TransportConstants.java
diff --git a/uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/Transportable.java b/uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/Transportable.java similarity index 100% rename from uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/Transportable.java rename to uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/Transportable.java
diff --git a/uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/TransportableFactory.java b/uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/TransportableFactory.java similarity index 100% rename from uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/TransportableFactory.java rename to uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/TransportableFactory.java
diff --git a/uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/VNSException.java b/uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/VNSException.java similarity index 100% rename from uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/VNSException.java rename to uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/VNSException.java
diff --git a/uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/VinciClient.java b/uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/VinciClient.java similarity index 100% rename from uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/VinciClient.java rename to uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/VinciClient.java
diff --git a/uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/VinciFrame.java b/uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/VinciFrame.java similarity index 100% rename from uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/VinciFrame.java rename to uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/VinciFrame.java
diff --git a/uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/VinciServable.java b/uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/VinciServable.java similarity index 100% rename from uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/VinciServable.java rename to uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/VinciServable.java
diff --git a/uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/VinciServableAdapter.java b/uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/VinciServableAdapter.java similarity index 100% rename from uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/VinciServableAdapter.java rename to uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/VinciServableAdapter.java
diff --git a/uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/VinciServer.java b/uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/VinciServer.java similarity index 100% rename from uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/VinciServer.java rename to uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/VinciServer.java
diff --git a/uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/VinciServerRunnable.java b/uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/VinciServerRunnable.java similarity index 100% rename from uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/VinciServerRunnable.java rename to uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/VinciServerRunnable.java
diff --git a/uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/XTalkTransporter.java b/uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/XTalkTransporter.java similarity index 100% rename from uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/XTalkTransporter.java rename to uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/XTalkTransporter.java
diff --git a/uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/context/VinciContext.java b/uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/context/VinciContext.java similarity index 100% rename from uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/context/VinciContext.java rename to uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/context/VinciContext.java
diff --git a/uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/document/AFrame.java b/uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/document/AFrame.java similarity index 100% rename from uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/document/AFrame.java rename to uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/document/AFrame.java
diff --git a/uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/document/AFrameLeaf.java b/uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/document/AFrameLeaf.java similarity index 100% rename from uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/document/AFrameLeaf.java rename to uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/document/AFrameLeaf.java
diff --git a/uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/document/XMLToVinci.java b/uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/document/XMLToVinci.java similarity index 100% rename from uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/document/XMLToVinci.java rename to uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/document/XMLToVinci.java
diff --git a/uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/document/XMLToXTalk.java b/uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/document/XMLToXTalk.java similarity index 100% rename from uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/document/XMLToXTalk.java rename to uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/document/XMLToXTalk.java
diff --git a/uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/document/XTalkToSAX.java b/uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/document/XTalkToSAX.java similarity index 100% rename from uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/document/XTalkToSAX.java rename to uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/document/XTalkToSAX.java
diff --git a/uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/util/Base64Converter.java b/uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/util/Base64Converter.java similarity index 100% rename from uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/util/Base64Converter.java rename to uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/util/Base64Converter.java
diff --git a/uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/util/Base64FormatException.java b/uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/util/Base64FormatException.java similarity index 100% rename from uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/util/Base64FormatException.java rename to uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/util/Base64FormatException.java
diff --git a/uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/util/StreamMaterializer.java b/uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/util/StreamMaterializer.java similarity index 100% rename from uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/util/StreamMaterializer.java rename to uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/util/StreamMaterializer.java
diff --git a/uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/util/TransportableConverter.java b/uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/util/TransportableConverter.java similarity index 100% rename from uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/util/TransportableConverter.java rename to uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/util/TransportableConverter.java
diff --git a/uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/util/UTFConverter.java b/uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/util/UTFConverter.java similarity index 100% rename from uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/util/UTFConverter.java rename to uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/util/UTFConverter.java
diff --git a/uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/util/XMLConverter.java b/uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/util/XMLConverter.java similarity index 100% rename from uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/util/XMLConverter.java rename to uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/util/XMLConverter.java
diff --git a/uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/vns/VNSConstants.java b/uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/vns/VNSConstants.java similarity index 100% rename from uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/vns/VNSConstants.java rename to uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/vns/VNSConstants.java
diff --git a/uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/vns/client/ResolveResult.java b/uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/vns/client/ResolveResult.java similarity index 100% rename from uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/vns/client/ResolveResult.java rename to uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/vns/client/ResolveResult.java
diff --git a/uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/vns/client/ServeonResult.java b/uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/vns/client/ServeonResult.java similarity index 100% rename from uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/vns/client/ServeonResult.java rename to uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/vns/client/ServeonResult.java
diff --git a/uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/vns/client/VNSConfig.java b/uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/vns/client/VNSConfig.java similarity index 100% rename from uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/vns/client/VNSConfig.java rename to uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/vns/client/VNSConfig.java
diff --git a/uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/vns/service/NameClient.java b/uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/vns/service/NameClient.java similarity index 100% rename from uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/vns/service/NameClient.java rename to uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/vns/service/NameClient.java
diff --git a/uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/vns/service/Service.java b/uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/vns/service/Service.java similarity index 100% rename from uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/vns/service/Service.java rename to uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/vns/service/Service.java
diff --git a/uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/vns/service/ServiceAlias.java b/uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/vns/service/ServiceAlias.java similarity index 100% rename from uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/vns/service/ServiceAlias.java rename to uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/vns/service/ServiceAlias.java
diff --git a/uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/vns/service/ServiceInfo.java b/uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/vns/service/ServiceInfo.java similarity index 100% rename from uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/vns/service/ServiceInfo.java rename to uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/vns/service/ServiceInfo.java
diff --git a/uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/vns/service/ServiceInterface.java b/uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/vns/service/ServiceInterface.java similarity index 100% rename from uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/vns/service/ServiceInterface.java rename to uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/vns/service/ServiceInterface.java
diff --git a/uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/vns/service/ServiceRegistry.java b/uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/vns/service/ServiceRegistry.java similarity index 100% rename from uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/vns/service/ServiceRegistry.java rename to uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/vns/service/ServiceRegistry.java
diff --git a/uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/vns/service/ServiceStack.java b/uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/vns/service/ServiceStack.java similarity index 100% rename from uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/vns/service/ServiceStack.java rename to uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/vns/service/ServiceStack.java
diff --git a/uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/vns/service/ServiceTree.java b/uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/vns/service/ServiceTree.java similarity index 100% rename from uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/vns/service/ServiceTree.java rename to uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/vns/service/ServiceTree.java
diff --git a/uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/vns/service/VNS.java b/uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/vns/service/VNS.java similarity index 100% rename from uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/vns/service/VNS.java rename to uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/vns/service/VNS.java
diff --git a/uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/vns/service/WorkspaceConfig.java b/uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/vns/service/WorkspaceConfig.java similarity index 100% rename from uimaj-2.2.1-06/jVinci/src/main/java/org/apache/vinci/transport/vns/service/WorkspaceConfig.java rename to uimaj-2.2.1-incubating/jVinci/src/main/java/org/apache/vinci/transport/vns/service/WorkspaceConfig.java
diff --git a/uimaj-2.2.1-06/uima-docbook-tool/HOW_TO b/uimaj-2.2.1-incubating/uima-docbook-tool/HOW_TO similarity index 100% rename from uimaj-2.2.1-06/uima-docbook-tool/HOW_TO rename to uimaj-2.2.1-incubating/uima-docbook-tool/HOW_TO
diff --git a/uimaj-2.2.1-06/uima-docbook-tool/README b/uimaj-2.2.1-incubating/uima-docbook-tool/README similarity index 100% rename from uimaj-2.2.1-06/uima-docbook-tool/README rename to uimaj-2.2.1-incubating/uima-docbook-tool/README
diff --git a/uimaj-2.2.1-06/uima-docbook-tool/README.FIRST b/uimaj-2.2.1-incubating/uima-docbook-tool/README.FIRST similarity index 100% rename from uimaj-2.2.1-06/uima-docbook-tool/README.FIRST rename to uimaj-2.2.1-incubating/uima-docbook-tool/README.FIRST
diff --git a/uimaj-2.2.1-06/uima-docbook-tool/build/build-docbook.xml b/uimaj-2.2.1-incubating/uima-docbook-tool/build/build-docbook.xml similarity index 100% rename from uimaj-2.2.1-06/uima-docbook-tool/build/build-docbook.xml rename to uimaj-2.2.1-incubating/uima-docbook-tool/build/build-docbook.xml
diff --git a/uimaj-2.2.1-06/uima-docbook-tool/build/common-properties-per-book.xml b/uimaj-2.2.1-incubating/uima-docbook-tool/build/common-properties-per-book.xml similarity index 100% rename from uimaj-2.2.1-06/uima-docbook-tool/build/common-properties-per-book.xml rename to uimaj-2.2.1-incubating/uima-docbook-tool/build/common-properties-per-book.xml
diff --git a/uimaj-2.2.1-06/uima-docbook-tool/build/get-components.xml b/uimaj-2.2.1-incubating/uima-docbook-tool/build/get-components.xml similarity index 100% rename from uimaj-2.2.1-06/uima-docbook-tool/build/get-components.xml rename to uimaj-2.2.1-incubating/uima-docbook-tool/build/get-components.xml
diff --git a/uimaj-2.2.1-06/uima-docbook-tool/build/process-one-book.xml b/uimaj-2.2.1-incubating/uima-docbook-tool/build/process-one-book.xml similarity index 100% rename from uimaj-2.2.1-06/uima-docbook-tool/build/process-one-book.xml rename to uimaj-2.2.1-incubating/uima-docbook-tool/build/process-one-book.xml
diff --git a/uimaj-2.2.1-06/uima-docbook-tool/catalog/docbook.version_4.4/CatalogManager.properties b/uimaj-2.2.1-incubating/uima-docbook-tool/catalog/docbook.version_4.4/CatalogManager.properties similarity index 100% rename from uimaj-2.2.1-06/uima-docbook-tool/catalog/docbook.version_4.4/CatalogManager.properties rename to uimaj-2.2.1-incubating/uima-docbook-tool/catalog/docbook.version_4.4/CatalogManager.properties
diff --git a/uimaj-2.2.1-06/uima-docbook-tool/catalog/docbook.version_4.4/xml-catalog.xml b/uimaj-2.2.1-incubating/uima-docbook-tool/catalog/docbook.version_4.4/xml-catalog.xml similarity index 100% rename from uimaj-2.2.1-06/uima-docbook-tool/catalog/docbook.version_4.4/xml-catalog.xml rename to uimaj-2.2.1-incubating/uima-docbook-tool/catalog/docbook.version_4.4/xml-catalog.xml
diff --git a/uimaj-2.2.1-06/uima-docbook-tool/catalog/docbook.version_4.5/CatalogManager.properties b/uimaj-2.2.1-incubating/uima-docbook-tool/catalog/docbook.version_4.5/CatalogManager.properties similarity index 100% rename from uimaj-2.2.1-06/uima-docbook-tool/catalog/docbook.version_4.5/CatalogManager.properties rename to uimaj-2.2.1-incubating/uima-docbook-tool/catalog/docbook.version_4.5/CatalogManager.properties
diff --git a/uimaj-2.2.1-06/uima-docbook-tool/catalog/docbook.version_4.5/xml-catalog.xml b/uimaj-2.2.1-incubating/uima-docbook-tool/catalog/docbook.version_4.5/xml-catalog.xml similarity index 100% rename from uimaj-2.2.1-06/uima-docbook-tool/catalog/docbook.version_4.5/xml-catalog.xml rename to uimaj-2.2.1-incubating/uima-docbook-tool/catalog/docbook.version_4.5/xml-catalog.xml
diff --git a/uimaj-2.2.1-06/uima-docbook-tool/properties/default.docbook.properties b/uimaj-2.2.1-incubating/uima-docbook-tool/properties/default.docbook.properties similarity index 100% rename from uimaj-2.2.1-06/uima-docbook-tool/properties/default.docbook.properties rename to uimaj-2.2.1-incubating/uima-docbook-tool/properties/default.docbook.properties
diff --git a/uimaj-2.2.1-06/uima-docbook-tool/samples/build_book-name.xml b/uimaj-2.2.1-incubating/uima-docbook-tool/samples/build_book-name.xml similarity index 100% rename from uimaj-2.2.1-06/uima-docbook-tool/samples/build_book-name.xml rename to uimaj-2.2.1-incubating/uima-docbook-tool/samples/build_book-name.xml
diff --git a/uimaj-2.2.1-06/uima-docbook-tool/samples/local.docbook.properties b/uimaj-2.2.1-incubating/uima-docbook-tool/samples/local.docbook.properties similarity index 100% rename from uimaj-2.2.1-06/uima-docbook-tool/samples/local.docbook.properties rename to uimaj-2.2.1-incubating/uima-docbook-tool/samples/local.docbook.properties
diff --git a/uimaj-2.2.1-06/uima-docbook-tool/samples/titlepage/titlepage-html.xml b/uimaj-2.2.1-incubating/uima-docbook-tool/samples/titlepage/titlepage-html.xml similarity index 100% rename from uimaj-2.2.1-06/uima-docbook-tool/samples/titlepage/titlepage-html.xml rename to uimaj-2.2.1-incubating/uima-docbook-tool/samples/titlepage/titlepage-html.xml
diff --git a/uimaj-2.2.1-06/uima-docbook-tool/samples/titlepage/titlepage-pdf.xml b/uimaj-2.2.1-incubating/uima-docbook-tool/samples/titlepage/titlepage-pdf.xml similarity index 100% rename from uimaj-2.2.1-06/uima-docbook-tool/samples/titlepage/titlepage-pdf.xml rename to uimaj-2.2.1-incubating/uima-docbook-tool/samples/titlepage/titlepage-pdf.xml
diff --git a/uimaj-2.2.1-06/uima-docbook-tool/samples/top/html-chunked.xsl b/uimaj-2.2.1-incubating/uima-docbook-tool/samples/top/html-chunked.xsl similarity index 100% rename from uimaj-2.2.1-06/uima-docbook-tool/samples/top/html-chunked.xsl rename to uimaj-2.2.1-incubating/uima-docbook-tool/samples/top/html-chunked.xsl
diff --git a/uimaj-2.2.1-06/uima-docbook-tool/samples/top/html-single.xsl b/uimaj-2.2.1-incubating/uima-docbook-tool/samples/top/html-single.xsl similarity index 100% rename from uimaj-2.2.1-06/uima-docbook-tool/samples/top/html-single.xsl rename to uimaj-2.2.1-incubating/uima-docbook-tool/samples/top/html-single.xsl
diff --git a/uimaj-2.2.1-06/uima-docbook-tool/samples/top/pdf.xsl b/uimaj-2.2.1-incubating/uima-docbook-tool/samples/top/pdf.xsl similarity index 100% rename from uimaj-2.2.1-06/uima-docbook-tool/samples/top/pdf.xsl rename to uimaj-2.2.1-incubating/uima-docbook-tool/samples/top/pdf.xsl
diff --git a/uimaj-2.2.1-06/uima-docbook-tool/styles/uima-style/common/entities.ent b/uimaj-2.2.1-incubating/uima-docbook-tool/styles/uima-style/common/entities.ent similarity index 100% rename from uimaj-2.2.1-06/uima-docbook-tool/styles/uima-style/common/entities.ent rename to uimaj-2.2.1-incubating/uima-docbook-tool/styles/uima-style/common/entities.ent
diff --git a/uimaj-2.2.1-06/uima-docbook-tool/styles/uima-style/common/html-pdf.xsl b/uimaj-2.2.1-incubating/uima-docbook-tool/styles/uima-style/common/html-pdf.xsl similarity index 100% rename from uimaj-2.2.1-06/uima-docbook-tool/styles/uima-style/common/html-pdf.xsl rename to uimaj-2.2.1-incubating/uima-docbook-tool/styles/uima-style/common/html-pdf.xsl
diff --git a/uimaj-2.2.1-06/uima-docbook-tool/styles/uima-style/common/html.xsl b/uimaj-2.2.1-incubating/uima-docbook-tool/styles/uima-style/common/html.xsl similarity index 100% rename from uimaj-2.2.1-06/uima-docbook-tool/styles/uima-style/common/html.xsl rename to uimaj-2.2.1-incubating/uima-docbook-tool/styles/uima-style/common/html.xsl
diff --git a/uimaj-2.2.1-06/uima-docbook-tool/styles/uima-style/css/stylesheet-html.css b/uimaj-2.2.1-incubating/uima-docbook-tool/styles/uima-style/css/stylesheet-html.css similarity index 100% rename from uimaj-2.2.1-06/uima-docbook-tool/styles/uima-style/css/stylesheet-html.css rename to uimaj-2.2.1-incubating/uima-docbook-tool/styles/uima-style/css/stylesheet-html.css
diff --git a/uimaj-2.2.1-06/uima-docbook-tool/styles/uima-style/top/html-single.xsl b/uimaj-2.2.1-incubating/uima-docbook-tool/styles/uima-style/top/html-single.xsl similarity index 100% rename from uimaj-2.2.1-06/uima-docbook-tool/styles/uima-style/top/html-single.xsl rename to uimaj-2.2.1-incubating/uima-docbook-tool/styles/uima-style/top/html-single.xsl
diff --git a/uimaj-2.2.1-06/uima-docbook-tool/styles/uima-style/top/pdf.xsl b/uimaj-2.2.1-incubating/uima-docbook-tool/styles/uima-style/top/pdf.xsl similarity index 100% rename from uimaj-2.2.1-06/uima-docbook-tool/styles/uima-style/top/pdf.xsl rename to uimaj-2.2.1-incubating/uima-docbook-tool/styles/uima-style/top/pdf.xsl
diff --git a/uimaj-2.2.1-06/uima-docbook-tool/tools/common-lib/LICENSES b/uimaj-2.2.1-incubating/uima-docbook-tool/tools/common-lib/LICENSES similarity index 100% rename from uimaj-2.2.1-06/uima-docbook-tool/tools/common-lib/LICENSES rename to uimaj-2.2.1-incubating/uima-docbook-tool/tools/common-lib/LICENSES
diff --git a/uimaj-2.2.1-06/uima-docbook-tool/tools/common-lib/LICENSES-APACHE.txt b/uimaj-2.2.1-incubating/uima-docbook-tool/tools/common-lib/LICENSES-APACHE.txt similarity index 100% rename from uimaj-2.2.1-06/uima-docbook-tool/tools/common-lib/LICENSES-APACHE.txt rename to uimaj-2.2.1-incubating/uima-docbook-tool/tools/common-lib/LICENSES-APACHE.txt
diff --git a/uimaj-2.2.1-06/uima-docbook-tool/tools/common-lib/avalon-framework-api-4.3.jar b/uimaj-2.2.1-incubating/uima-docbook-tool/tools/common-lib/avalon-framework-api-4.3.jar similarity index 100% rename from uimaj-2.2.1-06/uima-docbook-tool/tools/common-lib/avalon-framework-api-4.3.jar rename to uimaj-2.2.1-incubating/uima-docbook-tool/tools/common-lib/avalon-framework-api-4.3.jar Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbook-tool/tools/common-lib/avalon-framework-impl-4.3.jar b/uimaj-2.2.1-incubating/uima-docbook-tool/tools/common-lib/avalon-framework-impl-4.3.jar similarity index 100% rename from uimaj-2.2.1-06/uima-docbook-tool/tools/common-lib/avalon-framework-impl-4.3.jar rename to uimaj-2.2.1-incubating/uima-docbook-tool/tools/common-lib/avalon-framework-impl-4.3.jar Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbook-tool/tools/common-lib/batik-all-1.6.jar b/uimaj-2.2.1-incubating/uima-docbook-tool/tools/common-lib/batik-all-1.6.jar similarity index 100% rename from uimaj-2.2.1-06/uima-docbook-tool/tools/common-lib/batik-all-1.6.jar rename to uimaj-2.2.1-incubating/uima-docbook-tool/tools/common-lib/batik-all-1.6.jar Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbook-tool/tools/common-lib/commons-io-1.1.jar b/uimaj-2.2.1-incubating/uima-docbook-tool/tools/common-lib/commons-io-1.1.jar similarity index 100% rename from uimaj-2.2.1-06/uima-docbook-tool/tools/common-lib/commons-io-1.1.jar rename to uimaj-2.2.1-incubating/uima-docbook-tool/tools/common-lib/commons-io-1.1.jar Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbook-tool/tools/common-lib/commons-logging-1.0.4.jar b/uimaj-2.2.1-incubating/uima-docbook-tool/tools/common-lib/commons-logging-1.0.4.jar similarity index 100% rename from uimaj-2.2.1-06/uima-docbook-tool/tools/common-lib/commons-logging-1.0.4.jar rename to uimaj-2.2.1-incubating/uima-docbook-tool/tools/common-lib/commons-logging-1.0.4.jar Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbook-tool/tools/common-lib/xercesImpl-2.7.1.jar b/uimaj-2.2.1-incubating/uima-docbook-tool/tools/common-lib/xercesImpl-2.7.1.jar similarity index 100% rename from uimaj-2.2.1-06/uima-docbook-tool/tools/common-lib/xercesImpl-2.7.1.jar rename to uimaj-2.2.1-incubating/uima-docbook-tool/tools/common-lib/xercesImpl-2.7.1.jar Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbook-tool/tools/common-lib/xml-apis-1.3.02.jar b/uimaj-2.2.1-incubating/uima-docbook-tool/tools/common-lib/xml-apis-1.3.02.jar similarity index 100% rename from uimaj-2.2.1-06/uima-docbook-tool/tools/common-lib/xml-apis-1.3.02.jar rename to uimaj-2.2.1-incubating/uima-docbook-tool/tools/common-lib/xml-apis-1.3.02.jar Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbook-tool/tools/common-lib/xml-resolver-1.1.jar b/uimaj-2.2.1-incubating/uima-docbook-tool/tools/common-lib/xml-resolver-1.1.jar similarity index 100% rename from uimaj-2.2.1-06/uima-docbook-tool/tools/common-lib/xml-resolver-1.1.jar rename to uimaj-2.2.1-incubating/uima-docbook-tool/tools/common-lib/xml-resolver-1.1.jar Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbook-tool/tools/fop-versions/README.txt b/uimaj-2.2.1-incubating/uima-docbook-tool/tools/fop-versions/README.txt similarity index 100% rename from uimaj-2.2.1-06/uima-docbook-tool/tools/fop-versions/README.txt rename to uimaj-2.2.1-incubating/uima-docbook-tool/tools/fop-versions/README.txt
diff --git a/uimaj-2.2.1-06/uima-docbook-tool/tools/fop-versions/fop-0.20.5/fonts/palatino-bold-italic.xml b/uimaj-2.2.1-incubating/uima-docbook-tool/tools/fop-versions/fop-0.20.5/fonts/palatino-bold-italic.xml similarity index 100% rename from uimaj-2.2.1-06/uima-docbook-tool/tools/fop-versions/fop-0.20.5/fonts/palatino-bold-italic.xml rename to uimaj-2.2.1-incubating/uima-docbook-tool/tools/fop-versions/fop-0.20.5/fonts/palatino-bold-italic.xml
diff --git a/uimaj-2.2.1-06/uima-docbook-tool/tools/fop-versions/fop-0.20.5/fonts/palatino-bold.xml b/uimaj-2.2.1-incubating/uima-docbook-tool/tools/fop-versions/fop-0.20.5/fonts/palatino-bold.xml similarity index 100% rename from uimaj-2.2.1-06/uima-docbook-tool/tools/fop-versions/fop-0.20.5/fonts/palatino-bold.xml rename to uimaj-2.2.1-incubating/uima-docbook-tool/tools/fop-versions/fop-0.20.5/fonts/palatino-bold.xml
diff --git a/uimaj-2.2.1-06/uima-docbook-tool/tools/fop-versions/fop-0.20.5/fonts/palatino-italic.xml b/uimaj-2.2.1-incubating/uima-docbook-tool/tools/fop-versions/fop-0.20.5/fonts/palatino-italic.xml similarity index 100% rename from uimaj-2.2.1-06/uima-docbook-tool/tools/fop-versions/fop-0.20.5/fonts/palatino-italic.xml rename to uimaj-2.2.1-incubating/uima-docbook-tool/tools/fop-versions/fop-0.20.5/fonts/palatino-italic.xml
diff --git a/uimaj-2.2.1-06/uima-docbook-tool/tools/fop-versions/fop-0.20.5/fonts/palatino.xml b/uimaj-2.2.1-incubating/uima-docbook-tool/tools/fop-versions/fop-0.20.5/fonts/palatino.xml similarity index 100% rename from uimaj-2.2.1-06/uima-docbook-tool/tools/fop-versions/fop-0.20.5/fonts/palatino.xml rename to uimaj-2.2.1-incubating/uima-docbook-tool/tools/fop-versions/fop-0.20.5/fonts/palatino.xml
diff --git a/uimaj-2.2.1-06/uima-docbook-tool/tools/fop-versions/fop-0.20.5/fop-config.xml b/uimaj-2.2.1-incubating/uima-docbook-tool/tools/fop-versions/fop-0.20.5/fop-config.xml similarity index 100% rename from uimaj-2.2.1-06/uima-docbook-tool/tools/fop-versions/fop-0.20.5/fop-config.xml rename to uimaj-2.2.1-incubating/uima-docbook-tool/tools/fop-versions/fop-0.20.5/fop-config.xml
diff --git a/uimaj-2.2.1-06/uima-docbook-tool/tools/fop-versions/fop-0.20.5/fop.jar b/uimaj-2.2.1-incubating/uima-docbook-tool/tools/fop-versions/fop-0.20.5/fop.jar similarity index 100% rename from uimaj-2.2.1-06/uima-docbook-tool/tools/fop-versions/fop-0.20.5/fop.jar rename to uimaj-2.2.1-incubating/uima-docbook-tool/tools/fop-versions/fop-0.20.5/fop.jar Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbook-tool/tools/fop-versions/fop-0.93/fonts/FOP_TT_font_metric_generation.xml b/uimaj-2.2.1-incubating/uima-docbook-tool/tools/fop-versions/fop-0.93/fonts/FOP_TT_font_metric_generation.xml similarity index 100% rename from uimaj-2.2.1-06/uima-docbook-tool/tools/fop-versions/fop-0.93/fonts/FOP_TT_font_metric_generation.xml rename to uimaj-2.2.1-incubating/uima-docbook-tool/tools/fop-versions/fop-0.93/fonts/FOP_TT_font_metric_generation.xml
diff --git a/uimaj-2.2.1-06/uima-docbook-tool/tools/fop-versions/fop-0.93/fonts/FOP_Type1_font_metric_generation.xml b/uimaj-2.2.1-incubating/uima-docbook-tool/tools/fop-versions/fop-0.93/fonts/FOP_Type1_font_metric_generation.xml similarity index 100% rename from uimaj-2.2.1-06/uima-docbook-tool/tools/fop-versions/fop-0.93/fonts/FOP_Type1_font_metric_generation.xml rename to uimaj-2.2.1-incubating/uima-docbook-tool/tools/fop-versions/fop-0.93/fonts/FOP_Type1_font_metric_generation.xml
diff --git a/uimaj-2.2.1-06/uima-docbook-tool/tools/fop-versions/fop-0.93/fonts/palatino-bold-italic.xml b/uimaj-2.2.1-incubating/uima-docbook-tool/tools/fop-versions/fop-0.93/fonts/palatino-bold-italic.xml similarity index 100% rename from uimaj-2.2.1-06/uima-docbook-tool/tools/fop-versions/fop-0.93/fonts/palatino-bold-italic.xml rename to uimaj-2.2.1-incubating/uima-docbook-tool/tools/fop-versions/fop-0.93/fonts/palatino-bold-italic.xml
diff --git a/uimaj-2.2.1-06/uima-docbook-tool/tools/fop-versions/fop-0.93/fonts/palatino-bold.xml b/uimaj-2.2.1-incubating/uima-docbook-tool/tools/fop-versions/fop-0.93/fonts/palatino-bold.xml similarity index 100% rename from uimaj-2.2.1-06/uima-docbook-tool/tools/fop-versions/fop-0.93/fonts/palatino-bold.xml rename to uimaj-2.2.1-incubating/uima-docbook-tool/tools/fop-versions/fop-0.93/fonts/palatino-bold.xml
diff --git a/uimaj-2.2.1-06/uima-docbook-tool/tools/fop-versions/fop-0.93/fonts/palatino-italic.xml b/uimaj-2.2.1-incubating/uima-docbook-tool/tools/fop-versions/fop-0.93/fonts/palatino-italic.xml similarity index 100% rename from uimaj-2.2.1-06/uima-docbook-tool/tools/fop-versions/fop-0.93/fonts/palatino-italic.xml rename to uimaj-2.2.1-incubating/uima-docbook-tool/tools/fop-versions/fop-0.93/fonts/palatino-italic.xml
diff --git a/uimaj-2.2.1-06/uima-docbook-tool/tools/fop-versions/fop-0.93/fonts/palatino.xml b/uimaj-2.2.1-incubating/uima-docbook-tool/tools/fop-versions/fop-0.93/fonts/palatino.xml similarity index 100% rename from uimaj-2.2.1-06/uima-docbook-tool/tools/fop-versions/fop-0.93/fonts/palatino.xml rename to uimaj-2.2.1-incubating/uima-docbook-tool/tools/fop-versions/fop-0.93/fonts/palatino.xml
diff --git a/uimaj-2.2.1-06/uima-docbook-tool/tools/fop-versions/fop-0.93/fop-config.xml b/uimaj-2.2.1-incubating/uima-docbook-tool/tools/fop-versions/fop-0.93/fop-config.xml similarity index 100% rename from uimaj-2.2.1-06/uima-docbook-tool/tools/fop-versions/fop-0.93/fop-config.xml rename to uimaj-2.2.1-incubating/uima-docbook-tool/tools/fop-versions/fop-0.93/fop-config.xml
diff --git a/uimaj-2.2.1-06/uima-docbook-tool/tools/fop-versions/fop-0.93/fop.jar b/uimaj-2.2.1-incubating/uima-docbook-tool/tools/fop-versions/fop-0.93/fop.jar similarity index 100% rename from uimaj-2.2.1-06/uima-docbook-tool/tools/fop-versions/fop-0.93/fop.jar rename to uimaj-2.2.1-incubating/uima-docbook-tool/tools/fop-versions/fop-0.93/fop.jar Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbook-tool/tools/fop-versions/fop-0.93/xmlgraphics-commons-1.1.jar b/uimaj-2.2.1-incubating/uima-docbook-tool/tools/fop-versions/fop-0.93/xmlgraphics-commons-1.1.jar similarity index 100% rename from uimaj-2.2.1-06/uima-docbook-tool/tools/fop-versions/fop-0.93/xmlgraphics-commons-1.1.jar rename to uimaj-2.2.1-incubating/uima-docbook-tool/tools/fop-versions/fop-0.93/xmlgraphics-commons-1.1.jar Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbook-tool/xinclude.mod b/uimaj-2.2.1-incubating/uima-docbook-tool/xinclude.mod similarity index 100% rename from uimaj-2.2.1-06/uima-docbook-tool/xinclude.mod rename to uimaj-2.2.1-incubating/uima-docbook-tool/xinclude.mod
diff --git a/uimaj-2.2.1-06/uima-docbooks/.project b/uimaj-2.2.1-incubating/uima-docbooks/.project similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/.project rename to uimaj-2.2.1-incubating/uima-docbooks/.project
diff --git a/uimaj-2.2.1-06/uima-docbooks/LICENSE.txt b/uimaj-2.2.1-incubating/uima-docbooks/LICENSE.txt similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/LICENSE.txt rename to uimaj-2.2.1-incubating/uima-docbooks/LICENSE.txt
diff --git a/uimaj-2.2.1-06/uima-docbooks/README.USER.txt b/uimaj-2.2.1-incubating/uima-docbooks/README.USER.txt similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/README.USER.txt rename to uimaj-2.2.1-incubating/uima-docbooks/README.USER.txt
diff --git a/uimaj-2.2.1-06/uima-docbooks/build-all-books.xml b/uimaj-2.2.1-incubating/uima-docbooks/build-all-books.xml similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/build-all-books.xml rename to uimaj-2.2.1-incubating/uima-docbooks/build-all-books.xml
diff --git a/uimaj-2.2.1-06/uima-docbooks/build.xml b/uimaj-2.2.1-incubating/uima-docbooks/build.xml similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/build.xml rename to uimaj-2.2.1-incubating/uima-docbooks/build.xml
diff --git a/uimaj-2.2.1-06/uima-docbooks/build_overview_and_setup.xml b/uimaj-2.2.1-incubating/uima-docbooks/build_overview_and_setup.xml similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/build_overview_and_setup.xml rename to uimaj-2.2.1-incubating/uima-docbooks/build_overview_and_setup.xml
diff --git a/uimaj-2.2.1-06/uima-docbooks/build_references.xml b/uimaj-2.2.1-incubating/uima-docbooks/build_references.xml similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/build_references.xml rename to uimaj-2.2.1-incubating/uima-docbooks/build_references.xml
diff --git a/uimaj-2.2.1-06/uima-docbooks/build_tools.xml b/uimaj-2.2.1-incubating/uima-docbooks/build_tools.xml similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/build_tools.xml rename to uimaj-2.2.1-incubating/uima-docbooks/build_tools.xml
diff --git a/uimaj-2.2.1-06/uima-docbooks/build_tutorials_and_users_guides.xml b/uimaj-2.2.1-incubating/uima-docbooks/build_tutorials_and_users_guides.xml similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/build_tutorials_and_users_guides.xml rename to uimaj-2.2.1-incubating/uima-docbooks/build_tutorials_and_users_guides.xml
diff --git a/uimaj-2.2.1-06/uima-docbooks/local.docbook.properties b/uimaj-2.2.1-incubating/uima-docbooks/local.docbook.properties similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/local.docbook.properties rename to uimaj-2.2.1-incubating/uima-docbooks/local.docbook.properties
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/changeLog b/uimaj-2.2.1-incubating/uima-docbooks/src/changeLog similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/changeLog rename to uimaj-2.2.1-incubating/uima-docbooks/src/changeLog
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/HOW_TO b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/HOW_TO similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/HOW_TO rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/HOW_TO
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/common_book_info.xml b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/common_book_info.xml similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/common_book_info.xml rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/common_book_info.xml
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/entities.ent b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/entities.ent similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/entities.ent rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/entities.ent
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/fontconfig.xml b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/fontconfig.xml similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/fontconfig.xml rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/fontconfig.xml
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/overview_and_setup/conceptual_overview.xml b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/overview_and_setup/conceptual_overview.xml similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/overview_and_setup/conceptual_overview.xml rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/overview_and_setup/conceptual_overview.xml
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/overview_and_setup/eclipse_setup.xml b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/overview_and_setup/eclipse_setup.xml similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/overview_and_setup/eclipse_setup.xml rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/overview_and_setup/eclipse_setup.xml
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/overview_and_setup/faqs.xml b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/overview_and_setup/faqs.xml similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/overview_and_setup/faqs.xml rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/overview_and_setup/faqs.xml
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/overview_and_setup/glossary.xml b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/overview_and_setup/glossary.xml similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/overview_and_setup/glossary.xml rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/overview_and_setup/glossary.xml
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/overview_and_setup/images/conceptual_overview_files/image002.png b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/overview_and_setup/images/conceptual_overview_files/image002.png similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/overview_and_setup/images/conceptual_overview_files/image002.png rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/overview_and_setup/images/conceptual_overview_files/image002.png Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/overview_and_setup/images/conceptual_overview_files/image004.png b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/overview_and_setup/images/conceptual_overview_files/image004.png similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/overview_and_setup/images/conceptual_overview_files/image004.png rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/overview_and_setup/images/conceptual_overview_files/image004.png Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/overview_and_setup/images/conceptual_overview_files/image006.png b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/overview_and_setup/images/conceptual_overview_files/image006.png similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/overview_and_setup/images/conceptual_overview_files/image006.png rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/overview_and_setup/images/conceptual_overview_files/image006.png Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/overview_and_setup/images/conceptual_overview_files/image008.png b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/overview_and_setup/images/conceptual_overview_files/image008.png similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/overview_and_setup/images/conceptual_overview_files/image008.png rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/overview_and_setup/images/conceptual_overview_files/image008.png Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/overview_and_setup/images/conceptual_overview_files/image010.png b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/overview_and_setup/images/conceptual_overview_files/image010.png similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/overview_and_setup/images/conceptual_overview_files/image010.png rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/overview_and_setup/images/conceptual_overview_files/image010.png Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/overview_and_setup/images/conceptual_overview_files/image012.png b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/overview_and_setup/images/conceptual_overview_files/image012.png similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/overview_and_setup/images/conceptual_overview_files/image012.png rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/overview_and_setup/images/conceptual_overview_files/image012.png Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/overview_and_setup/images/conceptual_overview_files/image014.png b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/overview_and_setup/images/conceptual_overview_files/image014.png similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/overview_and_setup/images/conceptual_overview_files/image014.png rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/overview_and_setup/images/conceptual_overview_files/image014.png Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/overview_and_setup/images/eclipse_setup_files/image002.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/overview_and_setup/images/eclipse_setup_files/image002.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/overview_and_setup/images/eclipse_setup_files/image002.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/overview_and_setup/images/eclipse_setup_files/image002.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/overview_and_setup/images/eclipse_setup_files/image004.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/overview_and_setup/images/eclipse_setup_files/image004.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/overview_and_setup/images/eclipse_setup_files/image004.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/overview_and_setup/images/eclipse_setup_files/image004.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/overview_and_setup/known_issues.xml b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/overview_and_setup/known_issues.xml similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/overview_and_setup/known_issues.xml rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/overview_and_setup/known_issues.xml
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/overview_and_setup/overview_and_setup.xml b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/overview_and_setup/overview_and_setup.xml similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/overview_and_setup/overview_and_setup.xml rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/overview_and_setup/overview_and_setup.xml
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/overview_and_setup/project_overview.xml b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/overview_and_setup/project_overview.xml similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/overview_and_setup/project_overview.xml rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/overview_and_setup/project_overview.xml
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/references/images/ref.cas/image001.png b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/references/images/ref.cas/image001.png similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/references/images/ref.cas/image001.png rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/references/images/ref.cas/image001.png Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/references/images/ref.javadocs/image002.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/references/images/ref.javadocs/image002.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/references/images/ref.javadocs/image002.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/references/images/ref.javadocs/image002.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/references/images/ref.pear/image002.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/references/images/ref.pear/image002.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/references/images/ref.pear/image002.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/references/images/ref.pear/image002.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/references/images/ref.xml.cpe_descriptor/image002.png b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/references/images/ref.xml.cpe_descriptor/image002.png similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/references/images/ref.xml.cpe_descriptor/image002.png rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/references/images/ref.xml.cpe_descriptor/image002.png Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/references/ref.cas.xml b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/references/ref.cas.xml similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/references/ref.cas.xml rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/references/ref.cas.xml
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/references/ref.javadocs.xml b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/references/ref.javadocs.xml similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/references/ref.javadocs.xml rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/references/ref.javadocs.xml
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/references/ref.jcas.xml b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/references/ref.jcas.xml similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/references/ref.jcas.xml rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/references/ref.jcas.xml
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/references/ref.pear.xml b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/references/ref.pear.xml similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/references/ref.pear.xml rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/references/ref.pear.xml
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/references/ref.xmi.xml b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/references/ref.xmi.xml similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/references/ref.xmi.xml rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/references/ref.xmi.xml
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/references/ref.xml.component_descriptor.xml b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/references/ref.xml.component_descriptor.xml similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/references/ref.xml.component_descriptor.xml rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/references/ref.xml.component_descriptor.xml
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/references/ref.xml.cpe_descriptor.xml b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/references/ref.xml.cpe_descriptor.xml similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/references/ref.xml.cpe_descriptor.xml rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/references/ref.xml.cpe_descriptor.xml
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/references/references.xml b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/references/references.xml similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/references/references.xml rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/references/references.xml
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.annotation_viewer/image002.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.annotation_viewer/image002.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.annotation_viewer/image002.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.annotation_viewer/image002.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cde/delegate-chooser.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cde/delegate-chooser.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cde/delegate-chooser.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cde/delegate-chooser.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cde/image002.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cde/image002.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cde/image002.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cde/image002.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cde/image004.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cde/image004.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cde/image004.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cde/image004.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cde/image006.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cde/image006.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cde/image006.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cde/image006.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cde/image008.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cde/image008.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cde/image008.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cde/image008.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cde/image010.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cde/image010.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cde/image010.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cde/image010.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cde/image012.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cde/image012.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cde/image012.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cde/image012.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cde/image014.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cde/image014.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cde/image014.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cde/image014.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cde/image016.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cde/image016.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cde/image016.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cde/image016.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cde/image018.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cde/image018.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cde/image018.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cde/image018.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cde/image020.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cde/image020.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cde/image020.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cde/image020.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cde/image022.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cde/image022.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cde/image022.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cde/image022.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cde/image024.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cde/image024.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cde/image024.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cde/image024.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cde/image026.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cde/image026.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cde/image026.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cde/image026.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cde/image028.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cde/image028.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cde/image028.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cde/image028.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cde/image030.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cde/image030.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cde/image030.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cde/image030.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cde/image032.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cde/image032.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cde/image032.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cde/image032.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cde/image034.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cde/image034.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cde/image034.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cde/image034.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cde/image036.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cde/image036.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cde/image036.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cde/image036.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cde/image038.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cde/image038.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cde/image038.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cde/image038.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cde/image040.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cde/image040.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cde/image040.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cde/image040.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cde/image042.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cde/image042.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cde/image042.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cde/image042.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cde/image044.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cde/image044.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cde/image044.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cde/image044.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cde/image046.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cde/image046.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cde/image046.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cde/image046.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cde/image048.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cde/image048.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cde/image048.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cde/image048.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cde/image050.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cde/image050.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cde/image050.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cde/image050.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cde/image052.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cde/image052.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cde/image052.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cde/image052.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cde/image054.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cde/image054.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cde/image054.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cde/image054.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cde/image056.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cde/image056.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cde/image056.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cde/image056.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cde/image058.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cde/image058.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cde/image058.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cde/image058.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cde/image060.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cde/image060.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cde/image060.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cde/image060.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cde/image062.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cde/image062.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cde/image062.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cde/image062.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cde/image064.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cde/image064.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cde/image064.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cde/image064.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cde/image066.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cde/image066.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cde/image066.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cde/image066.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cde/image068.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cde/image068.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cde/image068.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cde/image068.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cde/image070.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cde/image070.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cde/image070.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cde/image070.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cde/image072.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cde/image072.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cde/image072.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cde/image072.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cde/import-chooser.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cde/import-chooser.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cde/import-chooser.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cde/import-chooser.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cpe/image002.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cpe/image002.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cpe/image002.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cpe/image002.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cpe/image004.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cpe/image004.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cpe/image004.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cpe/image004.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cvd/AnnotationViewer.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cvd/AnnotationViewer.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cvd/AnnotationViewer.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cvd/AnnotationViewer.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cvd/ChangeCodePage.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cvd/ChangeCodePage.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cvd/ChangeCodePage.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cvd/ChangeCodePage.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cvd/CustomizeColors.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cvd/CustomizeColors.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cvd/CustomizeColors.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cvd/CustomizeColors.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cvd/EditMenu.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cvd/EditMenu.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cvd/EditMenu.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cvd/EditMenu.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cvd/ErrorExample.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cvd/ErrorExample.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cvd/ErrorExample.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cvd/ErrorExample.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cvd/FileMenu.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cvd/FileMenu.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cvd/FileMenu.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cvd/FileMenu.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cvd/LogView.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cvd/LogView.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cvd/LogView.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cvd/LogView.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cvd/Main1.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cvd/Main1.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cvd/Main1.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cvd/Main1.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cvd/Main2.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cvd/Main2.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cvd/Main2.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cvd/Main2.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cvd/Main3.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cvd/Main3.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cvd/Main3.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cvd/Main3.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cvd/Main4.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cvd/Main4.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cvd/Main4.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cvd/Main4.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cvd/RunMenu.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cvd/RunMenu.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cvd/RunMenu.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cvd/RunMenu.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cvd/StatusBar.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cvd/StatusBar.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cvd/StatusBar.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cvd/StatusBar.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cvd/TypeSystemViewer.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cvd/TypeSystemViewer.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cvd/TypeSystemViewer.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cvd/TypeSystemViewer.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cvd/eclipse-cvd-launch.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cvd/eclipse-cvd-launch.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.cvd/eclipse-cvd-launch.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.cvd/eclipse-cvd-launch.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.doc_analyzer/image002.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.doc_analyzer/image002.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.doc_analyzer/image002.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.doc_analyzer/image002.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.doc_analyzer/image004.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.doc_analyzer/image004.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.doc_analyzer/image004.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.doc_analyzer/image004.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.doc_analyzer/image006.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.doc_analyzer/image006.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.doc_analyzer/image006.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.doc_analyzer/image006.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.doc_analyzer/image008.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.doc_analyzer/image008.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.doc_analyzer/image008.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.doc_analyzer/image008.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.doc_analyzer/image010.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.doc_analyzer/image010.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.doc_analyzer/image010.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.doc_analyzer/image010.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.jcasgen/image002.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.jcasgen/image002.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.jcasgen/image002.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.jcasgen/image002.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.jcasgen/image004.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.jcasgen/image004.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.jcasgen/image004.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.jcasgen/image004.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.pear.installer/image002.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.pear.installer/image002.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.pear.installer/image002.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.pear.installer/image002.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.pear.packager/image001.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.pear.packager/image001.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.pear.packager/image001.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.pear.packager/image001.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.pear.packager/image002.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.pear.packager/image002.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.pear.packager/image002.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.pear.packager/image002.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.pear.packager/image004.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.pear.packager/image004.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.pear.packager/image004.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.pear.packager/image004.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.pear.packager/image005.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.pear.packager/image005.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.pear.packager/image005.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.pear.packager/image005.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.pear.packager/image006.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.pear.packager/image006.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.pear.packager/image006.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.pear.packager/image006.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.pear.packager/image008.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.pear.packager/image008.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.pear.packager/image008.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.pear.packager/image008.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.pear.packager/image010.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.pear.packager/image010.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/images/tools.pear.packager/image010.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/images/tools.pear.packager/image010.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/tools.annotation_viewer.xml b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/tools.annotation_viewer.xml similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/tools.annotation_viewer.xml rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/tools.annotation_viewer.xml
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/tools.cde.xml b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/tools.cde.xml similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/tools.cde.xml rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/tools.cde.xml
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/tools.cpe.xml b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/tools.cpe.xml similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/tools.cpe.xml rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/tools.cpe.xml
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/tools.cvd.xml b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/tools.cvd.xml similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/tools.cvd.xml rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/tools.cvd.xml
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/tools.doc_analyzer.xml b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/tools.doc_analyzer.xml similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/tools.doc_analyzer.xml rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/tools.doc_analyzer.xml
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/tools.jcasgen.xml b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/tools.jcasgen.xml similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/tools.jcasgen.xml rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/tools.jcasgen.xml
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/tools.pear.installer.xml b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/tools.pear.installer.xml similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/tools.pear.installer.xml rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/tools.pear.installer.xml
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/tools.pear.merger.xml b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/tools.pear.merger.xml similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/tools.pear.merger.xml rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/tools.pear.merger.xml
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/tools.pear.packager.xml b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/tools.pear.packager.xml similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/tools.pear.packager.xml rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/tools.pear.packager.xml
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/tools.xml b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/tools.xml similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tools/tools.xml rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tools/tools.xml
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/annotator_analysis_engine_guide.xml b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/annotator_analysis_engine_guide.xml similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/annotator_analysis_engine_guide.xml rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/annotator_analysis_engine_guide.xml
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image002.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image002.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image002.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image002.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image004.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image004.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image004.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image004.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image006.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image006.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image006.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image006.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image008.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image008.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image008.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image008.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image010.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image010.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image010.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image010.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image012.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image012.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image012.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image012.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image014.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image014.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image014.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image014.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image016.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image016.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image016.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image016.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image018.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image018.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image018.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image018.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image020.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image020.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image020.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image020.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image022.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image022.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image022.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image022.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image024.png b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image024.png similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image024.png rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image024.png Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image026.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image026.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image026.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image026.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image028.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image028.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image028.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image028.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image030.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image030.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image030.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image030.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image032.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image032.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image032.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image032.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image034.png b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image034.png similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image034.png rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image034.png Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image036.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image036.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image036.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image036.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image038.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image038.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image038.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image038.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image040.png b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image040.png similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image040.png rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image040.png Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image042.png b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image042.png similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image042.png rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image042.png Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image044.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image044.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image044.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image044.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image046.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image046.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image046.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image046.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image048.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image048.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image048.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image048.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image050.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image050.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image050.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.aae/image050.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.application/image002.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.application/image002.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.application/image002.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.application/image002.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.application/image004.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.application/image004.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.application/image004.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.application/image004.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.application/image006.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.application/image006.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.application/image006.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.application/image006.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.cas_multiplier/image002.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.cas_multiplier/image002.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.cas_multiplier/image002.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.cas_multiplier/image002.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.cpe/image002.png b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.cpe/image002.png similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.cpe/image002.png rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.cpe/image002.png Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.cpe/image004.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.cpe/image004.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.cpe/image004.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.cpe/image004.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.cpe/image006.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.cpe/image006.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.cpe/image006.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.cpe/image006.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.cpe/image008.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.cpe/image008.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.cpe/image008.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.cpe/image008.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.cpe/image010.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.cpe/image010.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.cpe/image010.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.cpe/image010.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.cpe/image012.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.cpe/image012.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.cpe/image012.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.cpe/image012.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.cpe/image014.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.cpe/image014.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.cpe/image014.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.cpe/image014.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.cpe/image018.png b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.cpe/image018.png similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.cpe/image018.png rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.cpe/image018.png Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.cpe/image020.png b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.cpe/image020.png similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.cpe/image020.png rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.cpe/image020.png Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.cpe/image023.png b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.cpe/image023.png similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.cpe/image023.png rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.cpe/image023.png Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.cpe/image026.png b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.cpe/image026.png similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.cpe/image026.png rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.cpe/image026.png Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.fc/image002.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.fc/image002.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.fc/image002.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.fc/image002.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.fc/image004.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.fc/image004.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.fc/image004.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.fc/image004.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.fc/image006.jpg b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.fc/image006.jpg similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.fc/image006.jpg rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/images/tug.fc/image006.jpg Binary files differ
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/tug.aas.xml b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/tug.aas.xml similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/tug.aas.xml rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/tug.aas.xml
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/tug.application.xml b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/tug.application.xml similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/tug.application.xml rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/tug.application.xml
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/tug.cas_multiplier.xml b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/tug.cas_multiplier.xml similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/tug.cas_multiplier.xml rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/tug.cas_multiplier.xml
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/tug.cpe.xml b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/tug.cpe.xml similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/tug.cpe.xml rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/tug.cpe.xml
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/tug.fc.xml b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/tug.fc.xml similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/tug.fc.xml rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/tug.fc.xml
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/tug.multi_views.xml b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/tug.multi_views.xml similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/tug.multi_views.xml rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/tug.multi_views.xml
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/tug.xmi_emf.xml b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/tug.xmi_emf.xml similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/tug.xmi_emf.xml rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/tug.xmi_emf.xml
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/tutorials_and_users_guides.xml b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/tutorials_and_users_guides.xml similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/tutorials_and_users_guides/tutorials_and_users_guides.xml rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/tutorials_and_users_guides/tutorials_and_users_guides.xml
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/uima/organization/name-conventions.txt b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/uima/organization/name-conventions.txt similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/uima/organization/name-conventions.txt rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/uima/organization/name-conventions.txt
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/docbook/uima/organization/olink-names b/uimaj-2.2.1-incubating/uima-docbooks/src/docbook/uima/organization/olink-names similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/docbook/uima/organization/olink-names rename to uimaj-2.2.1-incubating/uima-docbooks/src/docbook/uima/organization/olink-names
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/index.html b/uimaj-2.2.1-incubating/uima-docbooks/src/index.html similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/index.html rename to uimaj-2.2.1-incubating/uima-docbooks/src/index.html
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/olink/olink_db_html.xml b/uimaj-2.2.1-incubating/uima-docbooks/src/olink/olink_db_html.xml similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/olink/olink_db_html.xml rename to uimaj-2.2.1-incubating/uima-docbooks/src/olink/olink_db_html.xml
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/olink/olink_db_htmlsingle.xml b/uimaj-2.2.1-incubating/uima-docbooks/src/olink/olink_db_htmlsingle.xml similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/olink/olink_db_htmlsingle.xml rename to uimaj-2.2.1-incubating/uima-docbooks/src/olink/olink_db_htmlsingle.xml
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/olink/olink_db_pdf.xml b/uimaj-2.2.1-incubating/uima-docbooks/src/olink/olink_db_pdf.xml similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/olink/olink_db_pdf.xml rename to uimaj-2.2.1-incubating/uima-docbooks/src/olink/olink_db_pdf.xml
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/olink/overview_and_setup/htmlsingle-target.db b/uimaj-2.2.1-incubating/uima-docbooks/src/olink/overview_and_setup/htmlsingle-target.db similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/olink/overview_and_setup/htmlsingle-target.db rename to uimaj-2.2.1-incubating/uima-docbooks/src/olink/overview_and_setup/htmlsingle-target.db
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/olink/overview_and_setup/pdf-target.db b/uimaj-2.2.1-incubating/uima-docbooks/src/olink/overview_and_setup/pdf-target.db similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/olink/overview_and_setup/pdf-target.db rename to uimaj-2.2.1-incubating/uima-docbooks/src/olink/overview_and_setup/pdf-target.db
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/olink/references/htmlsingle-target.db b/uimaj-2.2.1-incubating/uima-docbooks/src/olink/references/htmlsingle-target.db similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/olink/references/htmlsingle-target.db rename to uimaj-2.2.1-incubating/uima-docbooks/src/olink/references/htmlsingle-target.db
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/olink/references/pdf-target.db b/uimaj-2.2.1-incubating/uima-docbooks/src/olink/references/pdf-target.db similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/olink/references/pdf-target.db rename to uimaj-2.2.1-incubating/uima-docbooks/src/olink/references/pdf-target.db
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/olink/tools/htmlsingle-target.db b/uimaj-2.2.1-incubating/uima-docbooks/src/olink/tools/htmlsingle-target.db similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/olink/tools/htmlsingle-target.db rename to uimaj-2.2.1-incubating/uima-docbooks/src/olink/tools/htmlsingle-target.db
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/olink/tools/pdf-target.db b/uimaj-2.2.1-incubating/uima-docbooks/src/olink/tools/pdf-target.db similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/olink/tools/pdf-target.db rename to uimaj-2.2.1-incubating/uima-docbooks/src/olink/tools/pdf-target.db
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/olink/tutorials_and_users_guides/htmlsingle-target.db b/uimaj-2.2.1-incubating/uima-docbooks/src/olink/tutorials_and_users_guides/htmlsingle-target.db similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/olink/tutorials_and_users_guides/htmlsingle-target.db rename to uimaj-2.2.1-incubating/uima-docbooks/src/olink/tutorials_and_users_guides/htmlsingle-target.db
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/olink/tutorials_and_users_guides/pdf-target.db b/uimaj-2.2.1-incubating/uima-docbooks/src/olink/tutorials_and_users_guides/pdf-target.db similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/olink/tutorials_and_users_guides/pdf-target.db rename to uimaj-2.2.1-incubating/uima-docbooks/src/olink/tutorials_and_users_guides/pdf-target.db
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/styles/titlepage/titlepage-html.xml b/uimaj-2.2.1-incubating/uima-docbooks/src/styles/titlepage/titlepage-html.xml similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/styles/titlepage/titlepage-html.xml rename to uimaj-2.2.1-incubating/uima-docbooks/src/styles/titlepage/titlepage-html.xml
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/styles/titlepage/titlepage-pdf.xml b/uimaj-2.2.1-incubating/uima-docbooks/src/styles/titlepage/titlepage-pdf.xml similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/styles/titlepage/titlepage-pdf.xml rename to uimaj-2.2.1-incubating/uima-docbooks/src/styles/titlepage/titlepage-pdf.xml
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/styles/top/html-single.xsl b/uimaj-2.2.1-incubating/uima-docbooks/src/styles/top/html-single.xsl similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/styles/top/html-single.xsl rename to uimaj-2.2.1-incubating/uima-docbooks/src/styles/top/html-single.xsl
diff --git a/uimaj-2.2.1-06/uima-docbooks/src/styles/top/pdf.xsl b/uimaj-2.2.1-incubating/uima-docbooks/src/styles/top/pdf.xsl similarity index 100% rename from uimaj-2.2.1-06/uima-docbooks/src/styles/top/pdf.xsl rename to uimaj-2.2.1-incubating/uima-docbooks/src/styles/top/pdf.xsl
diff --git a/uimaj-2.2.1-06/uimaj-adapter-soap/pom.xml b/uimaj-2.2.1-incubating/uimaj-adapter-soap/pom.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-adapter-soap/pom.xml rename to uimaj-2.2.1-incubating/uimaj-adapter-soap/pom.xml
diff --git a/uimaj-2.2.1-06/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/AxisAnalysisEngineServiceStub.java b/uimaj-2.2.1-incubating/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/AxisAnalysisEngineServiceStub.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/AxisAnalysisEngineServiceStub.java rename to uimaj-2.2.1-incubating/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/AxisAnalysisEngineServiceStub.java
diff --git a/uimaj-2.2.1-06/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/AxisAnalysisEngineService_impl.java b/uimaj-2.2.1-incubating/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/AxisAnalysisEngineService_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/AxisAnalysisEngineService_impl.java rename to uimaj-2.2.1-incubating/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/AxisAnalysisEngineService_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/AxisResourceServiceManager.java b/uimaj-2.2.1-incubating/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/AxisResourceServiceManager.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/AxisResourceServiceManager.java rename to uimaj-2.2.1-incubating/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/AxisResourceServiceManager.java
diff --git a/uimaj-2.2.1-06/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/AxisResourceServiceStub.java b/uimaj-2.2.1-incubating/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/AxisResourceServiceStub.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/AxisResourceServiceStub.java rename to uimaj-2.2.1-incubating/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/AxisResourceServiceStub.java
diff --git a/uimaj-2.2.1-06/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/BinaryDeserializer.java b/uimaj-2.2.1-incubating/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/BinaryDeserializer.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/BinaryDeserializer.java rename to uimaj-2.2.1-incubating/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/BinaryDeserializer.java
diff --git a/uimaj-2.2.1-06/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/BinaryDeserializerFactory.java b/uimaj-2.2.1-incubating/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/BinaryDeserializerFactory.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/BinaryDeserializerFactory.java rename to uimaj-2.2.1-incubating/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/BinaryDeserializerFactory.java
diff --git a/uimaj-2.2.1-06/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/BinarySerializer.java b/uimaj-2.2.1-incubating/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/BinarySerializer.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/BinarySerializer.java rename to uimaj-2.2.1-incubating/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/BinarySerializer.java
diff --git a/uimaj-2.2.1-06/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/BinarySerializerFactory.java b/uimaj-2.2.1-incubating/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/BinarySerializerFactory.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/BinarySerializerFactory.java rename to uimaj-2.2.1-incubating/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/BinarySerializerFactory.java
diff --git a/uimaj-2.2.1-06/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/SoapAnalysisEngineServiceAdapter.java b/uimaj-2.2.1-incubating/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/SoapAnalysisEngineServiceAdapter.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/SoapAnalysisEngineServiceAdapter.java rename to uimaj-2.2.1-incubating/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/SoapAnalysisEngineServiceAdapter.java
diff --git a/uimaj-2.2.1-06/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/XmlDeserializer.java b/uimaj-2.2.1-incubating/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/XmlDeserializer.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/XmlDeserializer.java rename to uimaj-2.2.1-incubating/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/XmlDeserializer.java
diff --git a/uimaj-2.2.1-06/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/XmlDeserializerFactory.java b/uimaj-2.2.1-incubating/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/XmlDeserializerFactory.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/XmlDeserializerFactory.java rename to uimaj-2.2.1-incubating/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/XmlDeserializerFactory.java
diff --git a/uimaj-2.2.1-06/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/XmlSerializer.java b/uimaj-2.2.1-incubating/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/XmlSerializer.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/XmlSerializer.java rename to uimaj-2.2.1-incubating/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/XmlSerializer.java
diff --git a/uimaj-2.2.1-06/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/XmlSerializerFactory.java b/uimaj-2.2.1-incubating/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/XmlSerializerFactory.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/XmlSerializerFactory.java rename to uimaj-2.2.1-incubating/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/XmlSerializerFactory.java
diff --git a/uimaj-2.2.1-06/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/axis11/BinaryDeserializer_Axis11.java b/uimaj-2.2.1-incubating/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/axis11/BinaryDeserializer_Axis11.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/axis11/BinaryDeserializer_Axis11.java rename to uimaj-2.2.1-incubating/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/axis11/BinaryDeserializer_Axis11.java
diff --git a/uimaj-2.2.1-06/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/axis11/BinarySerializer_Axis11.java b/uimaj-2.2.1-incubating/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/axis11/BinarySerializer_Axis11.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/axis11/BinarySerializer_Axis11.java rename to uimaj-2.2.1-incubating/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/axis11/BinarySerializer_Axis11.java
diff --git a/uimaj-2.2.1-06/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/axis11/XmlDeserializer_Axis11.java b/uimaj-2.2.1-incubating/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/axis11/XmlDeserializer_Axis11.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/axis11/XmlDeserializer_Axis11.java rename to uimaj-2.2.1-incubating/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/axis11/XmlDeserializer_Axis11.java
diff --git a/uimaj-2.2.1-06/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/axis11/XmlSerializer_Axis11.java b/uimaj-2.2.1-incubating/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/axis11/XmlSerializer_Axis11.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/axis11/XmlSerializer_Axis11.java rename to uimaj-2.2.1-incubating/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/axis11/XmlSerializer_Axis11.java
diff --git a/uimaj-2.2.1-06/uimaj-adapter-vinci/pom.xml b/uimaj-2.2.1-incubating/uimaj-adapter-vinci/pom.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-adapter-vinci/pom.xml rename to uimaj-2.2.1-incubating/uimaj-adapter-vinci/pom.xml
diff --git a/uimaj-2.2.1-06/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/CASTransportable.java b/uimaj-2.2.1-incubating/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/CASTransportable.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/CASTransportable.java rename to uimaj-2.2.1-incubating/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/CASTransportable.java
diff --git a/uimaj-2.2.1-06/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/VinciAnalysisEngineServiceAdapter.java b/uimaj-2.2.1-incubating/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/VinciAnalysisEngineServiceAdapter.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/VinciAnalysisEngineServiceAdapter.java rename to uimaj-2.2.1-incubating/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/VinciAnalysisEngineServiceAdapter.java
diff --git a/uimaj-2.2.1-06/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/VinciAnalysisEngineServiceStub.java b/uimaj-2.2.1-incubating/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/VinciAnalysisEngineServiceStub.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/VinciAnalysisEngineServiceStub.java rename to uimaj-2.2.1-incubating/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/VinciAnalysisEngineServiceStub.java
diff --git a/uimaj-2.2.1-06/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/VinciAnalysisEngineService_impl.java b/uimaj-2.2.1-incubating/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/VinciAnalysisEngineService_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/VinciAnalysisEngineService_impl.java rename to uimaj-2.2.1-incubating/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/VinciAnalysisEngineService_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/VinciBinaryAnalysisEngineServiceStub.java b/uimaj-2.2.1-incubating/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/VinciBinaryAnalysisEngineServiceStub.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/VinciBinaryAnalysisEngineServiceStub.java rename to uimaj-2.2.1-incubating/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/VinciBinaryAnalysisEngineServiceStub.java
diff --git a/uimaj-2.2.1-06/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/VinciBinaryAnalysisEngineService_impl.java b/uimaj-2.2.1-incubating/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/VinciBinaryAnalysisEngineService_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/VinciBinaryAnalysisEngineService_impl.java rename to uimaj-2.2.1-incubating/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/VinciBinaryAnalysisEngineService_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/util/Constants.java b/uimaj-2.2.1-incubating/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/util/Constants.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/util/Constants.java rename to uimaj-2.2.1-incubating/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/util/Constants.java
diff --git a/uimaj-2.2.1-06/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/util/Descriptor.java b/uimaj-2.2.1-incubating/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/util/Descriptor.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/util/Descriptor.java rename to uimaj-2.2.1-incubating/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/util/Descriptor.java
diff --git a/uimaj-2.2.1-06/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/util/NetworkUtil.java b/uimaj-2.2.1-incubating/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/util/NetworkUtil.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/util/NetworkUtil.java rename to uimaj-2.2.1-incubating/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/util/NetworkUtil.java
diff --git a/uimaj-2.2.1-06/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/util/SaxVinciFrameBuilder.java b/uimaj-2.2.1-incubating/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/util/SaxVinciFrameBuilder.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/util/SaxVinciFrameBuilder.java rename to uimaj-2.2.1-incubating/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/util/SaxVinciFrameBuilder.java
diff --git a/uimaj-2.2.1-06/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/util/Shutdown.java b/uimaj-2.2.1-incubating/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/util/Shutdown.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/util/Shutdown.java rename to uimaj-2.2.1-incubating/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/util/Shutdown.java
diff --git a/uimaj-2.2.1-06/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/util/UimaSaxVinciFrameBuilder.java b/uimaj-2.2.1-incubating/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/util/UimaSaxVinciFrameBuilder.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/util/UimaSaxVinciFrameBuilder.java rename to uimaj-2.2.1-incubating/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/util/UimaSaxVinciFrameBuilder.java
diff --git a/uimaj-2.2.1-06/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/util/VinciSaxParser.java b/uimaj-2.2.1-incubating/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/util/VinciSaxParser.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/util/VinciSaxParser.java rename to uimaj-2.2.1-incubating/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/util/VinciSaxParser.java
diff --git a/uimaj-2.2.1-06/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/util/VinciTAEClient.java b/uimaj-2.2.1-incubating/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/util/VinciTAEClient.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/util/VinciTAEClient.java rename to uimaj-2.2.1-incubating/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/util/VinciTAEClient.java
diff --git a/uimaj-2.2.1-06/uimaj-adapter-vinci/src/test/java/org/apache/uima/adapter/vinci/VinciAnalysisEngineServiceAdapterTest.java b/uimaj-2.2.1-incubating/uimaj-adapter-vinci/src/test/java/org/apache/uima/adapter/vinci/VinciAnalysisEngineServiceAdapterTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-adapter-vinci/src/test/java/org/apache/uima/adapter/vinci/VinciAnalysisEngineServiceAdapterTest.java rename to uimaj-2.2.1-incubating/uimaj-adapter-vinci/src/test/java/org/apache/uima/adapter/vinci/VinciAnalysisEngineServiceAdapterTest.java
diff --git a/uimaj-2.2.1-06/uimaj-component-test-util/pom.xml b/uimaj-2.2.1-incubating/uimaj-component-test-util/pom.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-component-test-util/pom.xml rename to uimaj-2.2.1-incubating/uimaj-component-test-util/pom.xml
diff --git a/uimaj-2.2.1-06/uimaj-component-test-util/src/main/java/org/apache/uima/test/junit_extension/AnnotationWriter.java b/uimaj-2.2.1-incubating/uimaj-component-test-util/src/main/java/org/apache/uima/test/junit_extension/AnnotationWriter.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-component-test-util/src/main/java/org/apache/uima/test/junit_extension/AnnotationWriter.java rename to uimaj-2.2.1-incubating/uimaj-component-test-util/src/main/java/org/apache/uima/test/junit_extension/AnnotationWriter.java
diff --git a/uimaj-2.2.1-06/uimaj-component-test-util/src/main/java/org/apache/uima/test/junit_extension/AnnotatorPerformanceTester.java b/uimaj-2.2.1-incubating/uimaj-component-test-util/src/main/java/org/apache/uima/test/junit_extension/AnnotatorPerformanceTester.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-component-test-util/src/main/java/org/apache/uima/test/junit_extension/AnnotatorPerformanceTester.java rename to uimaj-2.2.1-incubating/uimaj-component-test-util/src/main/java/org/apache/uima/test/junit_extension/AnnotatorPerformanceTester.java
diff --git a/uimaj-2.2.1-06/uimaj-component-test-util/src/main/java/org/apache/uima/test/junit_extension/AnnotatorTester.java b/uimaj-2.2.1-incubating/uimaj-component-test-util/src/main/java/org/apache/uima/test/junit_extension/AnnotatorTester.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-component-test-util/src/main/java/org/apache/uima/test/junit_extension/AnnotatorTester.java rename to uimaj-2.2.1-incubating/uimaj-component-test-util/src/main/java/org/apache/uima/test/junit_extension/AnnotatorTester.java
diff --git a/uimaj-2.2.1-06/uimaj-component-test-util/src/main/java/org/apache/uima/test/junit_extension/PerformanceTestResult.java b/uimaj-2.2.1-incubating/uimaj-component-test-util/src/main/java/org/apache/uima/test/junit_extension/PerformanceTestResult.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-component-test-util/src/main/java/org/apache/uima/test/junit_extension/PerformanceTestResult.java rename to uimaj-2.2.1-incubating/uimaj-component-test-util/src/main/java/org/apache/uima/test/junit_extension/PerformanceTestResult.java
diff --git a/uimaj-2.2.1-06/uimaj-component-test-util/src/main/java/org/apache/uima/test/junit_extension/PerformanceTestResultImpl.java b/uimaj-2.2.1-incubating/uimaj-component-test-util/src/main/java/org/apache/uima/test/junit_extension/PerformanceTestResultImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-component-test-util/src/main/java/org/apache/uima/test/junit_extension/PerformanceTestResultImpl.java rename to uimaj-2.2.1-incubating/uimaj-component-test-util/src/main/java/org/apache/uima/test/junit_extension/PerformanceTestResultImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-component-test-util/src/main/resources/AnnotationWriter.xml b/uimaj-2.2.1-incubating/uimaj-component-test-util/src/main/resources/AnnotationWriter.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-component-test-util/src/main/resources/AnnotationWriter.xml rename to uimaj-2.2.1-incubating/uimaj-component-test-util/src/main/resources/AnnotationWriter.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/pom.xml b/uimaj-2.2.1-incubating/uimaj-core/pom.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/pom.xml rename to uimaj-2.2.1-incubating/uimaj-core/pom.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/CompositeResourceFactory.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/CompositeResourceFactory.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/CompositeResourceFactory.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/CompositeResourceFactory.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/Constants.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/Constants.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/Constants.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/Constants.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/InternationalizedException.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/InternationalizedException.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/InternationalizedException.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/InternationalizedException.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/InternationalizedRuntimeException.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/InternationalizedRuntimeException.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/InternationalizedRuntimeException.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/InternationalizedRuntimeException.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/ResourceFactory.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/ResourceFactory.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/ResourceFactory.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/ResourceFactory.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/ResourceSpecifierFactory.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/ResourceSpecifierFactory.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/ResourceSpecifierFactory.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/ResourceSpecifierFactory.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/UIMAException.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/UIMAException.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/UIMAException.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/UIMAException.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/UIMAFramework.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/UIMAFramework.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/UIMAFramework.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/UIMAFramework.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/UIMARuntimeException.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/UIMARuntimeException.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/UIMARuntimeException.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/UIMARuntimeException.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/UIMA_IllegalArgumentException.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/UIMA_IllegalArgumentException.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/UIMA_IllegalArgumentException.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/UIMA_IllegalArgumentException.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/UIMA_IllegalStateException.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/UIMA_IllegalStateException.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/UIMA_IllegalStateException.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/UIMA_IllegalStateException.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/UIMA_UnsupportedOperationException.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/UIMA_UnsupportedOperationException.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/UIMA_UnsupportedOperationException.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/UIMA_UnsupportedOperationException.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/UimaContext.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/UimaContext.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/UimaContext.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/UimaContext.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/UimaContextAdmin.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/UimaContextAdmin.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/UimaContextAdmin.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/UimaContextAdmin.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_component/AnalysisComponent.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_component/AnalysisComponent.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_component/AnalysisComponent.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_component/AnalysisComponent.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_component/AnalysisComponent_ImplBase.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_component/AnalysisComponent_ImplBase.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_component/AnalysisComponent_ImplBase.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_component/AnalysisComponent_ImplBase.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_component/Annotator_ImplBase.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_component/Annotator_ImplBase.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_component/Annotator_ImplBase.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_component/Annotator_ImplBase.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_component/CasAnnotator_ImplBase.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_component/CasAnnotator_ImplBase.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_component/CasAnnotator_ImplBase.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_component/CasAnnotator_ImplBase.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_component/CasMultiplier_ImplBase.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_component/CasMultiplier_ImplBase.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_component/CasMultiplier_ImplBase.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_component/CasMultiplier_ImplBase.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_component/JCasAnnotator_ImplBase.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_component/JCasAnnotator_ImplBase.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_component/JCasAnnotator_ImplBase.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_component/JCasAnnotator_ImplBase.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_component/JCasMultiplier_ImplBase.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_component/JCasMultiplier_ImplBase.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_component/JCasMultiplier_ImplBase.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_component/JCasMultiplier_ImplBase.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/AnalysisEngine.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/AnalysisEngine.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/AnalysisEngine.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/AnalysisEngine.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/AnalysisEngineDescription.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/AnalysisEngineDescription.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/AnalysisEngineDescription.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/AnalysisEngineDescription.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/AnalysisEngineManagement.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/AnalysisEngineManagement.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/AnalysisEngineManagement.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/AnalysisEngineManagement.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/AnalysisEngineProcessException.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/AnalysisEngineProcessException.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/AnalysisEngineProcessException.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/AnalysisEngineProcessException.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/AnalysisEngineServiceStub.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/AnalysisEngineServiceStub.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/AnalysisEngineServiceStub.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/AnalysisEngineServiceStub.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/AnalysisProcessData.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/AnalysisProcessData.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/AnalysisProcessData.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/AnalysisProcessData.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/CasIterator.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/CasIterator.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/CasIterator.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/CasIterator.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/JCasIterator.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/JCasIterator.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/JCasIterator.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/JCasIterator.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/ResultNotSupportedException.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/ResultNotSupportedException.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/ResultNotSupportedException.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/ResultNotSupportedException.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/ResultSpecification.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/ResultSpecification.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/ResultSpecification.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/ResultSpecification.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/TaeDescription.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/TaeDescription.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/TaeDescription.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/TaeDescription.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/TextAnalysisEngine.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/TextAnalysisEngine.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/TextAnalysisEngine.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/TextAnalysisEngine.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/TypeOrFeature.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/TypeOrFeature.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/TypeOrFeature.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/TypeOrFeature.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/AnnotatorConfigurationException.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/AnnotatorConfigurationException.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/AnnotatorConfigurationException.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/AnnotatorConfigurationException.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/AnnotatorContext.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/AnnotatorContext.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/AnnotatorContext.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/AnnotatorContext.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/AnnotatorContextException.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/AnnotatorContextException.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/AnnotatorContextException.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/AnnotatorContextException.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/AnnotatorInitializationException.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/AnnotatorInitializationException.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/AnnotatorInitializationException.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/AnnotatorInitializationException.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/AnnotatorProcessException.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/AnnotatorProcessException.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/AnnotatorProcessException.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/AnnotatorProcessException.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/Annotator_ImplBase.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/Annotator_ImplBase.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/Annotator_ImplBase.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/Annotator_ImplBase.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/BaseAnnotator.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/BaseAnnotator.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/BaseAnnotator.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/BaseAnnotator.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/GenericAnnotator.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/GenericAnnotator.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/GenericAnnotator.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/GenericAnnotator.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/GenericAnnotator_ImplBase.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/GenericAnnotator_ImplBase.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/GenericAnnotator_ImplBase.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/GenericAnnotator_ImplBase.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/JTextAnnotator.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/JTextAnnotator.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/JTextAnnotator.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/JTextAnnotator.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/JTextAnnotator_ImplBase.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/JTextAnnotator_ImplBase.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/JTextAnnotator_ImplBase.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/JTextAnnotator_ImplBase.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/TextAnnotator.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/TextAnnotator.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/TextAnnotator.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/TextAnnotator.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/package.html b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/package.html similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/package.html rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/package.html
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/asb/ASB.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/asb/ASB.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/asb/ASB.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/asb/ASB.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/asb/impl/ASB_impl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/asb/impl/ASB_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/asb/impl/ASB_impl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/asb/impl/ASB_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/asb/impl/FlowContainer.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/asb/impl/FlowContainer.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/asb/impl/FlowContainer.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/asb/impl/FlowContainer.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/asb/impl/FlowControllerContainer.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/asb/impl/FlowControllerContainer.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/asb/impl/FlowControllerContainer.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/asb/impl/FlowControllerContainer.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/asb/package.html b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/asb/package.html similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/asb/package.html rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/asb/package.html
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AggregateAnalysisEngine_impl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AggregateAnalysisEngine_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AggregateAnalysisEngine_impl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AggregateAnalysisEngine_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisEngineDescription_impl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisEngineDescription_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisEngineDescription_impl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisEngineDescription_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisEngineImplBase.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisEngineImplBase.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisEngineImplBase.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisEngineImplBase.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisEngineManagementImpl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisEngineManagementImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisEngineManagementImpl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisEngineManagementImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisEngineManagementImplMBean.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisEngineManagementImplMBean.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisEngineManagementImplMBean.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisEngineManagementImplMBean.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisProcessData_impl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisProcessData_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisProcessData_impl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisProcessData_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnnotatorContext_impl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnnotatorContext_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnnotatorContext_impl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnnotatorContext_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/EmptyCasIterator.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/EmptyCasIterator.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/EmptyCasIterator.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/EmptyCasIterator.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/JCasIteratorWrapper.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/JCasIteratorWrapper.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/JCasIteratorWrapper.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/JCasIteratorWrapper.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/MultiprocessingAnalysisEngine_impl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/MultiprocessingAnalysisEngine_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/MultiprocessingAnalysisEngine_impl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/MultiprocessingAnalysisEngine_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/PearAnalysisEngineWrapper.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/PearAnalysisEngineWrapper.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/PearAnalysisEngineWrapper.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/PearAnalysisEngineWrapper.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/PrimitiveAnalysisEngine_impl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/PrimitiveAnalysisEngine_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/PrimitiveAnalysisEngine_impl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/PrimitiveAnalysisEngine_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/ResultSpecification_impl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/ResultSpecification_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/ResultSpecification_impl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/ResultSpecification_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/TaeDescription_impl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/TaeDescription_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/TaeDescription_impl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/TaeDescription_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/TypeOrFeature_impl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/TypeOrFeature_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/TypeOrFeature_impl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/TypeOrFeature_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/UimacppAnalysisEngineImpl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/UimacppAnalysisEngineImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/UimacppAnalysisEngineImpl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/UimacppAnalysisEngineImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/compatibility/AnalysisComponentAdapterFactory.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/compatibility/AnalysisComponentAdapterFactory.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/compatibility/AnalysisComponentAdapterFactory.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/compatibility/AnalysisComponentAdapterFactory.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/compatibility/AnnotatorAdapter.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/compatibility/AnnotatorAdapter.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/compatibility/AnnotatorAdapter.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/compatibility/AnnotatorAdapter.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/compatibility/CasConsumerAdapter.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/compatibility/CasConsumerAdapter.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/compatibility/CasConsumerAdapter.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/compatibility/CasConsumerAdapter.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/compatibility/CollectionReaderAdapter.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/compatibility/CollectionReaderAdapter.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/compatibility/CollectionReaderAdapter.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/compatibility/CollectionReaderAdapter.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/metadata/AnalysisEngineMetaData.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/metadata/AnalysisEngineMetaData.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/metadata/AnalysisEngineMetaData.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/metadata/AnalysisEngineMetaData.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/metadata/CapabilityLanguageFlow.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/metadata/CapabilityLanguageFlow.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/metadata/CapabilityLanguageFlow.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/metadata/CapabilityLanguageFlow.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/metadata/FixedFlow.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/metadata/FixedFlow.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/metadata/FixedFlow.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/metadata/FixedFlow.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/metadata/FlowConstraints.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/metadata/FlowConstraints.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/metadata/FlowConstraints.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/metadata/FlowConstraints.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/metadata/FlowControllerDeclaration.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/metadata/FlowControllerDeclaration.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/metadata/FlowControllerDeclaration.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/metadata/FlowControllerDeclaration.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/metadata/SofaMapping.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/metadata/SofaMapping.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/metadata/SofaMapping.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/metadata/SofaMapping.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/metadata/impl/AnalysisEngineMetaData_impl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/metadata/impl/AnalysisEngineMetaData_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/metadata/impl/AnalysisEngineMetaData_impl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/metadata/impl/AnalysisEngineMetaData_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/metadata/impl/CapabilityLanguageFlow_impl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/metadata/impl/CapabilityLanguageFlow_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/metadata/impl/CapabilityLanguageFlow_impl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/metadata/impl/CapabilityLanguageFlow_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/metadata/impl/FixedFlow_impl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/metadata/impl/FixedFlow_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/metadata/impl/FixedFlow_impl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/metadata/impl/FixedFlow_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/metadata/impl/FlowControllerDeclaration_impl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/metadata/impl/FlowControllerDeclaration_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/metadata/impl/FlowControllerDeclaration_impl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/metadata/impl/FlowControllerDeclaration_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/metadata/impl/SofaMapping_impl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/metadata/impl/SofaMapping_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/metadata/impl/SofaMapping_impl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/metadata/impl/SofaMapping_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/metadata/package.html b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/metadata/package.html similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/metadata/package.html rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/metadata/package.html
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/package.html b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/package.html similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/package.html rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/package.html
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/service/impl/AnalysisEngineServiceAdapter.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/service/impl/AnalysisEngineServiceAdapter.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/service/impl/AnalysisEngineServiceAdapter.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/service/impl/AnalysisEngineServiceAdapter.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/service/impl/AnalysisEngineService_impl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/service/impl/AnalysisEngineService_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/service/impl/AnalysisEngineService_impl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/service/impl/AnalysisEngineService_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/service/impl/ServiceDataCargo.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/service/impl/ServiceDataCargo.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/analysis_engine/service/impl/ServiceDataCargo.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/analysis_engine/service/impl/ServiceDataCargo.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/AbstractCas.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/AbstractCas.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/AbstractCas.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/AbstractCas.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/AbstractCas_ImplBase.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/AbstractCas_ImplBase.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/AbstractCas_ImplBase.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/AbstractCas_ImplBase.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/AnnotationBaseFS.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/AnnotationBaseFS.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/AnnotationBaseFS.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/AnnotationBaseFS.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/ArrayFS.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/ArrayFS.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/ArrayFS.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/ArrayFS.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/BooleanArrayFS.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/BooleanArrayFS.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/BooleanArrayFS.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/BooleanArrayFS.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/ByteArrayFS.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/ByteArrayFS.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/ByteArrayFS.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/ByteArrayFS.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/CAS.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/CAS.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/CAS.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/CAS.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/CASException.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/CASException.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/CASException.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/CASException.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/CASRuntimeException.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/CASRuntimeException.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/CASRuntimeException.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/CASRuntimeException.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/CasOwner.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/CasOwner.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/CasOwner.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/CasOwner.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/CommonArrayFS.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/CommonArrayFS.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/CommonArrayFS.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/CommonArrayFS.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/ComponentInfo.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/ComponentInfo.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/ComponentInfo.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/ComponentInfo.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/ConstraintFactory.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/ConstraintFactory.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/ConstraintFactory.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/ConstraintFactory.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/DoubleArrayFS.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/DoubleArrayFS.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/DoubleArrayFS.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/DoubleArrayFS.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/FSConstraint.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/FSConstraint.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/FSConstraint.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/FSConstraint.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/FSFloatConstraint.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/FSFloatConstraint.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/FSFloatConstraint.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/FSFloatConstraint.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/FSIndex.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/FSIndex.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/FSIndex.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/FSIndex.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/FSIndexRepository.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/FSIndexRepository.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/FSIndexRepository.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/FSIndexRepository.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/FSIntConstraint.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/FSIntConstraint.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/FSIntConstraint.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/FSIntConstraint.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/FSIterator.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/FSIterator.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/FSIterator.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/FSIterator.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/FSMatchConstraint.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/FSMatchConstraint.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/FSMatchConstraint.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/FSMatchConstraint.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/FSStringConstraint.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/FSStringConstraint.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/FSStringConstraint.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/FSStringConstraint.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/FSTypeConstraint.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/FSTypeConstraint.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/FSTypeConstraint.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/FSTypeConstraint.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/Feature.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/Feature.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/Feature.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/Feature.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/FeaturePath.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/FeaturePath.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/FeaturePath.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/FeaturePath.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/FeatureStructure.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/FeatureStructure.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/FeatureStructure.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/FeatureStructure.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/FeatureValuePath.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/FeatureValuePath.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/FeatureValuePath.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/FeatureValuePath.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/FloatArrayFS.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/FloatArrayFS.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/FloatArrayFS.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/FloatArrayFS.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/IntArrayFS.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/IntArrayFS.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/IntArrayFS.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/IntArrayFS.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/LongArrayFS.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/LongArrayFS.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/LongArrayFS.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/LongArrayFS.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/ParsingException.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/ParsingException.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/ParsingException.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/ParsingException.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/ShortArrayFS.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/ShortArrayFS.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/ShortArrayFS.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/ShortArrayFS.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/SofaFS.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/SofaFS.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/SofaFS.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/SofaFS.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/SofaID.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/SofaID.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/SofaID.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/SofaID.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/StringArrayFS.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/StringArrayFS.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/StringArrayFS.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/StringArrayFS.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/Type.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/Type.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/Type.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/TypeNameSpace.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/TypeNameSpace.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/TypeNameSpace.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/TypeNameSpace.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/TypeSystem.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/TypeSystem.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/TypeSystem.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/TypeSystem.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/admin/CASAdminException.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/admin/CASAdminException.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/admin/CASAdminException.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/admin/CASAdminException.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/admin/CASFactory.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/admin/CASFactory.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/admin/CASFactory.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/admin/CASFactory.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/admin/CASMgr.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/admin/CASMgr.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/admin/CASMgr.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/admin/CASMgr.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/admin/FSIndexComparator.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/admin/FSIndexComparator.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/admin/FSIndexComparator.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/admin/FSIndexComparator.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/admin/FSIndexRepositoryMgr.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/admin/FSIndexRepositoryMgr.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/admin/FSIndexRepositoryMgr.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/admin/FSIndexRepositoryMgr.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/admin/LinearTypeOrder.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/admin/LinearTypeOrder.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/admin/LinearTypeOrder.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/admin/LinearTypeOrder.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/admin/LinearTypeOrderBuilder.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/admin/LinearTypeOrderBuilder.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/admin/LinearTypeOrderBuilder.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/admin/LinearTypeOrderBuilder.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/admin/TypeSystemMgr.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/admin/TypeSystemMgr.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/admin/TypeSystemMgr.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/admin/TypeSystemMgr.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/AnnotationBaseImpl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/AnnotationBaseImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/AnnotationBaseImpl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/AnnotationBaseImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/AnnotationImpl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/AnnotationImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/AnnotationImpl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/AnnotationImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/AnnotationImplException.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/AnnotationImplException.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/AnnotationImplException.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/AnnotationImplException.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/AnnotationIndexImpl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/AnnotationIndexImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/AnnotationIndexImpl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/AnnotationIndexImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/AnnotationTreeImpl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/AnnotationTreeImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/AnnotationTreeImpl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/AnnotationTreeImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/AnnotationTreeNodeImpl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/AnnotationTreeNodeImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/AnnotationTreeNodeImpl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/AnnotationTreeNodeImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/ArrayFSGenerator.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/ArrayFSGenerator.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/ArrayFSGenerator.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/ArrayFSGenerator.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/ArrayFSImpl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/ArrayFSImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/ArrayFSImpl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/ArrayFSImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/BooleanArrayFSImpl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/BooleanArrayFSImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/BooleanArrayFSImpl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/BooleanArrayFSImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/ByteArrayFSImpl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/ByteArrayFSImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/ByteArrayFSImpl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/ByteArrayFSImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/ByteHeap.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/ByteHeap.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/ByteHeap.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/ByteHeap.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASCompleteSerializer.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASCompleteSerializer.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASCompleteSerializer.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASCompleteSerializer.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASMetadata.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASMetadata.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASMetadata.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASMetadata.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASMgrSerializer.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASMgrSerializer.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASMgrSerializer.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASMgrSerializer.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASSerializer.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASSerializer.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASSerializer.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASSerializer.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/CommonArrayFSImpl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/CommonArrayFSImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/CommonArrayFSImpl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/CommonArrayFSImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/CommonAuxArrayFSImpl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/CommonAuxArrayFSImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/CommonAuxArrayFSImpl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/CommonAuxArrayFSImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/CommonAuxHeap.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/CommonAuxHeap.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/CommonAuxHeap.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/CommonAuxHeap.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/ConjunctiveConstraint.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/ConjunctiveConstraint.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/ConjunctiveConstraint.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/ConjunctiveConstraint.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/ConstraintFactoryImpl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/ConstraintFactoryImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/ConstraintFactoryImpl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/ConstraintFactoryImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/DebugFSLogicalStructure.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/DebugFSLogicalStructure.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/DebugFSLogicalStructure.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/DebugFSLogicalStructure.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/DebugNameValuePair.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/DebugNameValuePair.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/DebugNameValuePair.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/DebugNameValuePair.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/DefaultAnnotationComparator.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/DefaultAnnotationComparator.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/DefaultAnnotationComparator.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/DefaultAnnotationComparator.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/DefaultFSAnnotationComparator.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/DefaultFSAnnotationComparator.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/DefaultFSAnnotationComparator.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/DefaultFSAnnotationComparator.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/DisjunctiveConstraint.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/DisjunctiveConstraint.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/DisjunctiveConstraint.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/DisjunctiveConstraint.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/DoubleArrayFSImpl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/DoubleArrayFSImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/DoubleArrayFSImpl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/DoubleArrayFSImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/EmbeddedConstraint.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/EmbeddedConstraint.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/EmbeddedConstraint.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/EmbeddedConstraint.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSBagIndex.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSBagIndex.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSBagIndex.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSBagIndex.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSClassRegistry.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSClassRegistry.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSClassRegistry.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSClassRegistry.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSComparator.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSComparator.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSComparator.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSComparator.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSFloatConstraintImpl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSFloatConstraintImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSFloatConstraintImpl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSFloatConstraintImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSGenerator.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSGenerator.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSGenerator.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSGenerator.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSImplComparator.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSImplComparator.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSImplComparator.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSImplComparator.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIndexComparatorImpl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIndexComparatorImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIndexComparatorImpl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIndexComparatorImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIndexImpl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIndexImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIndexImpl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIndexImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIndexRepositoryImpl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIndexRepositoryImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIndexRepositoryImpl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIndexRepositoryImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIntArrayIndex.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIntArrayIndex.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIntArrayIndex.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIntArrayIndex.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIntConstraintImpl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIntConstraintImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIntConstraintImpl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIntConstraintImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIteratorAggregate.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIteratorAggregate.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIteratorAggregate.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIteratorAggregate.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIteratorImplBase.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIteratorImplBase.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIteratorImplBase.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIteratorImplBase.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIteratorWrapper.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIteratorWrapper.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIteratorWrapper.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIteratorWrapper.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSLeafIndexImpl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSLeafIndexImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSLeafIndexImpl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSLeafIndexImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSListIteratorImpl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSListIteratorImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSListIteratorImpl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSListIteratorImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSRBTIndex.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSRBTIndex.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSRBTIndex.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSRBTIndex.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSRBTSetIndex.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSRBTSetIndex.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSRBTSetIndex.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSRBTSetIndex.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSRefIterator.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSRefIterator.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSRefIterator.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSRefIterator.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSStringConstraintImpl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSStringConstraintImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSStringConstraintImpl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSStringConstraintImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSTypeConstraintImpl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSTypeConstraintImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSTypeConstraintImpl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSTypeConstraintImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSVectorIndex.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSVectorIndex.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSVectorIndex.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSVectorIndex.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureImpl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureImpl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeaturePathImpl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeaturePathImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeaturePathImpl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeaturePathImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureStructureImpl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureStructureImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureStructureImpl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureStructureImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureStructureImplC.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureStructureImplC.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureStructureImplC.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureStructureImplC.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureValuePathImpl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureValuePathImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureValuePathImpl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureValuePathImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/FilteredIterator.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/FilteredIterator.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/FilteredIterator.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/FilteredIterator.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/FloatArrayFSImpl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/FloatArrayFSImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/FloatArrayFSImpl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/FloatArrayFSImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/FloatConstraint.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/FloatConstraint.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/FloatConstraint.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/FloatConstraint.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/Heap.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/Heap.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/Heap.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/Heap.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/IntArrayFSImpl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/IntArrayFSImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/IntArrayFSImpl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/IntArrayFSImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/IntConstraint.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/IntConstraint.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/IntConstraint.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/IntConstraint.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/LLUnambiguousIteratorImpl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/LLUnambiguousIteratorImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/LLUnambiguousIteratorImpl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/LLUnambiguousIteratorImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/LinearTypeOrderBuilderImpl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/LinearTypeOrderBuilderImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/LinearTypeOrderBuilderImpl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/LinearTypeOrderBuilderImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/ListUtils.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/ListUtils.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/ListUtils.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/ListUtils.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/LongArrayFSImpl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/LongArrayFSImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/LongArrayFSImpl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/LongArrayFSImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/LongHeap.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/LongHeap.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/LongHeap.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/LongHeap.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/LowLevelCAS.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/LowLevelCAS.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/LowLevelCAS.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/LowLevelCAS.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/LowLevelException.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/LowLevelException.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/LowLevelException.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/LowLevelException.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/LowLevelIndex.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/LowLevelIndex.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/LowLevelIndex.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/LowLevelIndex.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/LowLevelIndexRepository.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/LowLevelIndexRepository.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/LowLevelIndexRepository.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/LowLevelIndexRepository.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/LowLevelIterator.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/LowLevelIterator.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/LowLevelIterator.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/LowLevelIterator.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/LowLevelIteratorWrapper.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/LowLevelIteratorWrapper.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/LowLevelIteratorWrapper.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/LowLevelIteratorWrapper.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/LowLevelTypeSystem.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/LowLevelTypeSystem.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/LowLevelTypeSystem.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/LowLevelTypeSystem.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/OutOfTypeSystemData.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/OutOfTypeSystemData.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/OutOfTypeSystemData.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/OutOfTypeSystemData.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/PathConstraint.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/PathConstraint.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/PathConstraint.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/PathConstraint.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/Serialization.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/Serialization.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/Serialization.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/Serialization.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/ShortArrayFSImpl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/ShortArrayFSImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/ShortArrayFSImpl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/ShortArrayFSImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/ShortHeap.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/ShortHeap.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/ShortHeap.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/ShortHeap.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/SofaFSImpl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/SofaFSImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/SofaFSImpl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/SofaFSImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/StringArrayFSImpl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/StringArrayFSImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/StringArrayFSImpl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/StringArrayFSImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/StringConstraint.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/StringConstraint.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/StringConstraint.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/StringConstraint.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/StringHeap.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/StringHeap.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/StringHeap.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/StringHeap.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/StringMap.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/StringMap.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/StringMap.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/StringMap.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/StringTypeImpl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/StringTypeImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/StringTypeImpl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/StringTypeImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/Subiterator.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/Subiterator.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/Subiterator.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/Subiterator.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeImpl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeImpl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeNameSpaceImpl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeNameSpaceImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeNameSpaceImpl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeNameSpaceImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeSystem2Xml.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeSystem2Xml.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeSystem2Xml.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeSystem2Xml.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeSystemImpl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeSystemImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeSystemImpl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeSystemImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeSystemUtils.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeSystemUtils.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeSystemUtils.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeSystemUtils.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/UnambiguousIteratorImpl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/UnambiguousIteratorImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/UnambiguousIteratorImpl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/UnambiguousIteratorImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASDeserializer.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASDeserializer.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASDeserializer.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASDeserializer.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASParsingException.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASParsingException.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASParsingException.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASParsingException.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASSerializer.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASSerializer.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASSerializer.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASSerializer.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/XMLTypeSystemConsts.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/XMLTypeSystemConsts.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/XMLTypeSystemConsts.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/XMLTypeSystemConsts.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasDeserializer.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasDeserializer.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasDeserializer.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasDeserializer.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasSerializer.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasSerializer.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasSerializer.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasSerializer.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiSerializationSharedData.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiSerializationSharedData.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiSerializationSharedData.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiSerializationSharedData.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/package.html b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/package.html similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/impl/package.html rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/impl/package.html
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/package.html b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/package.html similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/package.html rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/package.html
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/text/AnnotationFS.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/text/AnnotationFS.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/text/AnnotationFS.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/text/AnnotationFS.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/text/AnnotationIndex.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/text/AnnotationIndex.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/text/AnnotationIndex.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/text/AnnotationIndex.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/text/AnnotationTree.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/text/AnnotationTree.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/text/AnnotationTree.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/text/AnnotationTree.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/text/AnnotationTreeNode.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/text/AnnotationTreeNode.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/text/AnnotationTreeNode.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/text/AnnotationTreeNode.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/text/Language.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/text/Language.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/text/Language.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/text/Language.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/text/package.html b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/text/package.html similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas/text/package.html rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas/text/package.html
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas_data/CasData.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas_data/CasData.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas_data/CasData.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas_data/CasData.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas_data/FeatureStructure.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas_data/FeatureStructure.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas_data/FeatureStructure.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas_data/FeatureStructure.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas_data/FeatureValue.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas_data/FeatureValue.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas_data/FeatureValue.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas_data/FeatureValue.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas_data/PrimitiveArrayFS.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas_data/PrimitiveArrayFS.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas_data/PrimitiveArrayFS.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas_data/PrimitiveArrayFS.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas_data/PrimitiveValue.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas_data/PrimitiveValue.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas_data/PrimitiveValue.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas_data/PrimitiveValue.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas_data/ReferenceArrayFS.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas_data/ReferenceArrayFS.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas_data/ReferenceArrayFS.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas_data/ReferenceArrayFS.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas_data/ReferenceValue.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas_data/ReferenceValue.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas_data/ReferenceValue.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas_data/ReferenceValue.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas_data/impl/CasDataImpl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas_data/impl/CasDataImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas_data/impl/CasDataImpl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas_data/impl/CasDataImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas_data/impl/CasDataToXCas.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas_data/impl/CasDataToXCas.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas_data/impl/CasDataToXCas.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas_data/impl/CasDataToXCas.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas_data/impl/CasDataUtils.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas_data/impl/CasDataUtils.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas_data/impl/CasDataUtils.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas_data/impl/CasDataUtils.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas_data/impl/FeatureStructureImpl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas_data/impl/FeatureStructureImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas_data/impl/FeatureStructureImpl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas_data/impl/FeatureStructureImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas_data/impl/PrimitiveArrayFSImpl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas_data/impl/PrimitiveArrayFSImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas_data/impl/PrimitiveArrayFSImpl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas_data/impl/PrimitiveArrayFSImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas_data/impl/PrimitiveValueImpl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas_data/impl/PrimitiveValueImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas_data/impl/PrimitiveValueImpl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas_data/impl/PrimitiveValueImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas_data/impl/ReferenceArrayFSImpl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas_data/impl/ReferenceArrayFSImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas_data/impl/ReferenceArrayFSImpl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas_data/impl/ReferenceArrayFSImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas_data/impl/ReferenceValueImpl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas_data/impl/ReferenceValueImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas_data/impl/ReferenceValueImpl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas_data/impl/ReferenceValueImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas_data/impl/XCasToCasDataSaxHandler.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas_data/impl/XCasToCasDataSaxHandler.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/cas_data/impl/XCasToCasDataSaxHandler.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/cas_data/impl/XCasToCasDataSaxHandler.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/CasConsumer.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/CasConsumer.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/CasConsumer.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/CasConsumer.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/CasConsumerDescription.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/CasConsumerDescription.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/CasConsumerDescription.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/CasConsumerDescription.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/CasConsumer_ImplBase.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/CasConsumer_ImplBase.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/CasConsumer_ImplBase.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/CasConsumer_ImplBase.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/CasInitializer.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/CasInitializer.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/CasInitializer.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/CasInitializer.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/CasInitializerDescription.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/CasInitializerDescription.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/CasInitializerDescription.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/CasInitializerDescription.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/CasInitializer_ImplBase.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/CasInitializer_ImplBase.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/CasInitializer_ImplBase.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/CasInitializer_ImplBase.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/CollectionException.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/CollectionException.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/CollectionException.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/CollectionException.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/CollectionProcessingEngine.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/CollectionProcessingEngine.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/CollectionProcessingEngine.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/CollectionProcessingEngine.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/CollectionProcessingManager.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/CollectionProcessingManager.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/CollectionProcessingManager.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/CollectionProcessingManager.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/CollectionReader.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/CollectionReader.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/CollectionReader.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/CollectionReader.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/CollectionReaderDescription.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/CollectionReaderDescription.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/CollectionReaderDescription.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/CollectionReaderDescription.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/CollectionReader_ImplBase.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/CollectionReader_ImplBase.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/CollectionReader_ImplBase.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/CollectionReader_ImplBase.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/EntityProcessStatus.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/EntityProcessStatus.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/EntityProcessStatus.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/EntityProcessStatus.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/StatusCallbackListener.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/StatusCallbackListener.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/StatusCallbackListener.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/StatusCallbackListener.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/AbortCPMException.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/AbortCPMException.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/AbortCPMException.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/AbortCPMException.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/AbortCasProcessorException.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/AbortCasProcessorException.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/AbortCasProcessorException.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/AbortCasProcessorException.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/BaseCPM.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/BaseCPM.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/BaseCPM.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/BaseCPM.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/BaseCollectionReader.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/BaseCollectionReader.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/BaseCollectionReader.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/BaseCollectionReader.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/BaseStatusCallbackListener.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/BaseStatusCallbackListener.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/BaseStatusCallbackListener.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/BaseStatusCallbackListener.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/CasDataCollectionReader.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/CasDataCollectionReader.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/CasDataCollectionReader.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/CasDataCollectionReader.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/CasDataCollectionReader_ImplBase.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/CasDataCollectionReader_ImplBase.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/CasDataCollectionReader_ImplBase.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/CasDataCollectionReader_ImplBase.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/CasDataConsumer.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/CasDataConsumer.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/CasDataConsumer.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/CasDataConsumer.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/CasDataConsumer_ImplBase.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/CasDataConsumer_ImplBase.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/CasDataConsumer_ImplBase.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/CasDataConsumer_ImplBase.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/CasDataInitializer.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/CasDataInitializer.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/CasDataInitializer.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/CasDataInitializer.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/CasDataInitializer_ImplBase.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/CasDataInitializer_ImplBase.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/CasDataInitializer_ImplBase.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/CasDataInitializer_ImplBase.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/CasDataProcessor.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/CasDataProcessor.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/CasDataProcessor.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/CasDataProcessor.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/CasDataStatusCallbackListener.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/CasDataStatusCallbackListener.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/CasDataStatusCallbackListener.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/CasDataStatusCallbackListener.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/CasObjectProcessor.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/CasObjectProcessor.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/CasObjectProcessor.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/CasObjectProcessor.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/CasProcessor.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/CasProcessor.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/CasProcessor.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/CasProcessor.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/RecoverableCollectionReader.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/RecoverableCollectionReader.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/RecoverableCollectionReader.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/RecoverableCollectionReader.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/SkipCasException.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/SkipCasException.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/SkipCasException.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/SkipCasException.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/SynchPoint.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/SynchPoint.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/SynchPoint.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/SynchPoint.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/impl/CasConsumerDescription_impl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/impl/CasConsumerDescription_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/impl/CasConsumerDescription_impl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/impl/CasConsumerDescription_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/impl/CasInitializerDescription_impl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/impl/CasInitializerDescription_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/impl/CasInitializerDescription_impl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/impl/CasInitializerDescription_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/impl/CollectionReaderDescription_impl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/impl/CollectionReaderDescription_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/impl/CollectionReaderDescription_impl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/impl/CollectionReaderDescription_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CasProcessorConfigurationParameterSettings.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CasProcessorConfigurationParameterSettings.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CasProcessorConfigurationParameterSettings.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CasProcessorConfigurationParameterSettings.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CasProcessorDeploymentParam.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CasProcessorDeploymentParam.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CasProcessorDeploymentParam.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CasProcessorDeploymentParam.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CasProcessorDeploymentParams.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CasProcessorDeploymentParams.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CasProcessorDeploymentParams.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CasProcessorDeploymentParams.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CasProcessorErrorHandling.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CasProcessorErrorHandling.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CasProcessorErrorHandling.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CasProcessorErrorHandling.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CasProcessorErrorRateThreshold.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CasProcessorErrorRateThreshold.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CasProcessorErrorRateThreshold.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CasProcessorErrorRateThreshold.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CasProcessorExecArg.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CasProcessorExecArg.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CasProcessorExecArg.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CasProcessorExecArg.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CasProcessorExecArgs.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CasProcessorExecArgs.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CasProcessorExecArgs.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CasProcessorExecArgs.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CasProcessorExecutable.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CasProcessorExecutable.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CasProcessorExecutable.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CasProcessorExecutable.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CasProcessorFilter.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CasProcessorFilter.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CasProcessorFilter.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CasProcessorFilter.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CasProcessorMaxRestarts.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CasProcessorMaxRestarts.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CasProcessorMaxRestarts.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CasProcessorMaxRestarts.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CasProcessorRunInSeperateProcess.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CasProcessorRunInSeperateProcess.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CasProcessorRunInSeperateProcess.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CasProcessorRunInSeperateProcess.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CasProcessorRuntimeEnvParam.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CasProcessorRuntimeEnvParam.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CasProcessorRuntimeEnvParam.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CasProcessorRuntimeEnvParam.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CasProcessorTimeout.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CasProcessorTimeout.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CasProcessorTimeout.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CasProcessorTimeout.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeCasProcessor.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeCasProcessor.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeCasProcessor.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeCasProcessor.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeCasProcessors.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeCasProcessors.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeCasProcessors.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeCasProcessors.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeCheckpoint.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeCheckpoint.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeCheckpoint.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeCheckpoint.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeCollectionReader.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeCollectionReader.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeCollectionReader.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeCollectionReader.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeCollectionReaderCasInitializer.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeCollectionReaderCasInitializer.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeCollectionReaderCasInitializer.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeCollectionReaderCasInitializer.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeCollectionReaderIterator.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeCollectionReaderIterator.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeCollectionReaderIterator.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeCollectionReaderIterator.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeComponentDescriptor.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeComponentDescriptor.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeComponentDescriptor.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeComponentDescriptor.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeConfiguration.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeConfiguration.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeConfiguration.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeConfiguration.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeDescription.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeDescription.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeDescription.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeDescription.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeDescriptorException.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeDescriptorException.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeDescriptorException.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeDescriptorException.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeInclude.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeInclude.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeInclude.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeInclude.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeIntegratedCasProcessor.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeIntegratedCasProcessor.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeIntegratedCasProcessor.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeIntegratedCasProcessor.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeLocalCasProcessor.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeLocalCasProcessor.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeLocalCasProcessor.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeLocalCasProcessor.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeRemoteCasProcessor.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeRemoteCasProcessor.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeRemoteCasProcessor.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeRemoteCasProcessor.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeResourceManagerConfiguration.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeResourceManagerConfiguration.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeResourceManagerConfiguration.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeResourceManagerConfiguration.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeSofaMapping.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeSofaMapping.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeSofaMapping.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeSofaMapping.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeSofaMappings.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeSofaMappings.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeSofaMappings.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeSofaMappings.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeTimer.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeTimer.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeTimer.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeTimer.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/metadata/NameValuePair.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/metadata/NameValuePair.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/metadata/NameValuePair.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/metadata/NameValuePair.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/metadata/OutputQueue.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/metadata/OutputQueue.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/metadata/OutputQueue.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/metadata/OutputQueue.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/metadata/package.html b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/metadata/package.html similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/metadata/package.html rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/metadata/package.html
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/package.html b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/package.html similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/collection/package.html rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/collection/package.html
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/ecore/Ecore2UimaTypeSystem.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/ecore/Ecore2UimaTypeSystem.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/ecore/Ecore2UimaTypeSystem.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/ecore/Ecore2UimaTypeSystem.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/ecore/UimaTypeSystem2Ecore.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/ecore/UimaTypeSystem2Ecore.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/ecore/UimaTypeSystem2Ecore.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/ecore/UimaTypeSystem2Ecore.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/examples/SourceDocumentInformation.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/examples/SourceDocumentInformation.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/examples/SourceDocumentInformation.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/examples/SourceDocumentInformation.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/examples/SourceDocumentInformation_Type.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/examples/SourceDocumentInformation_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/examples/SourceDocumentInformation_Type.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/examples/SourceDocumentInformation_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/flow/CasFlowController_ImplBase.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/flow/CasFlowController_ImplBase.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/flow/CasFlowController_ImplBase.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/flow/CasFlowController_ImplBase.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/flow/CasFlow_ImplBase.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/flow/CasFlow_ImplBase.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/flow/CasFlow_ImplBase.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/flow/CasFlow_ImplBase.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/flow/FinalStep.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/flow/FinalStep.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/flow/FinalStep.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/flow/FinalStep.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/flow/Flow.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/flow/Flow.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/flow/Flow.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/flow/Flow.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/flow/FlowController.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/flow/FlowController.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/flow/FlowController.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/flow/FlowController.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/flow/FlowControllerContext.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/flow/FlowControllerContext.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/flow/FlowControllerContext.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/flow/FlowControllerContext.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/flow/FlowControllerDescription.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/flow/FlowControllerDescription.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/flow/FlowControllerDescription.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/flow/FlowControllerDescription.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/flow/FlowController_ImplBase.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/flow/FlowController_ImplBase.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/flow/FlowController_ImplBase.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/flow/FlowController_ImplBase.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/flow/JCasFlowController_ImplBase.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/flow/JCasFlowController_ImplBase.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/flow/JCasFlowController_ImplBase.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/flow/JCasFlowController_ImplBase.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/flow/JCasFlow_ImplBase.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/flow/JCasFlow_ImplBase.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/flow/JCasFlow_ImplBase.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/flow/JCasFlow_ImplBase.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/flow/ParallelStep.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/flow/ParallelStep.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/flow/ParallelStep.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/flow/ParallelStep.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/flow/SimpleStep.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/flow/SimpleStep.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/flow/SimpleStep.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/flow/SimpleStep.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/flow/SimpleStepWithResultSpec.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/flow/SimpleStepWithResultSpec.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/flow/SimpleStepWithResultSpec.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/flow/SimpleStepWithResultSpec.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/flow/Step.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/flow/Step.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/flow/Step.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/flow/Step.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/flow/impl/AnalysisSequenceCapabilityNode.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/flow/impl/AnalysisSequenceCapabilityNode.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/flow/impl/AnalysisSequenceCapabilityNode.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/flow/impl/AnalysisSequenceCapabilityNode.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/flow/impl/CapabilityContainer.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/flow/impl/CapabilityContainer.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/flow/impl/CapabilityContainer.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/flow/impl/CapabilityContainer.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/flow/impl/CapabilityLanguageFlowController.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/flow/impl/CapabilityLanguageFlowController.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/flow/impl/CapabilityLanguageFlowController.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/flow/impl/CapabilityLanguageFlowController.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/flow/impl/CapabilityLanguageFlowObject.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/flow/impl/CapabilityLanguageFlowObject.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/flow/impl/CapabilityLanguageFlowObject.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/flow/impl/CapabilityLanguageFlowObject.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/flow/impl/FixedFlowController.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/flow/impl/FixedFlowController.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/flow/impl/FixedFlowController.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/flow/impl/FixedFlowController.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/flow/impl/FlowControllerContext_impl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/flow/impl/FlowControllerContext_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/flow/impl/FlowControllerContext_impl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/flow/impl/FlowControllerContext_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/flow/impl/FlowControllerDescription_impl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/flow/impl/FlowControllerDescription_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/flow/impl/FlowControllerDescription_impl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/flow/impl/FlowControllerDescription_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/impl/AnalysisEngineFactory_impl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/impl/AnalysisEngineFactory_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/impl/AnalysisEngineFactory_impl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/impl/AnalysisEngineFactory_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/impl/CasConsumerFactory_impl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/impl/CasConsumerFactory_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/impl/CasConsumerFactory_impl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/impl/CasConsumerFactory_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/impl/CasInitializerFactory_impl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/impl/CasInitializerFactory_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/impl/CasInitializerFactory_impl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/impl/CasInitializerFactory_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/impl/ChildUimaContext_impl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/impl/ChildUimaContext_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/impl/ChildUimaContext_impl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/impl/ChildUimaContext_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/impl/CollectionReaderFactory_impl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/impl/CollectionReaderFactory_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/impl/CollectionReaderFactory_impl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/impl/CollectionReaderFactory_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/impl/CompositeResourceFactory_impl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/impl/CompositeResourceFactory_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/impl/CompositeResourceFactory_impl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/impl/CompositeResourceFactory_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/impl/CustomResourceFactory_impl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/impl/CustomResourceFactory_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/impl/CustomResourceFactory_impl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/impl/CustomResourceFactory_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/impl/ResourceSpecifierFactory_impl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/impl/ResourceSpecifierFactory_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/impl/ResourceSpecifierFactory_impl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/impl/ResourceSpecifierFactory_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/impl/RootUimaContext_impl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/impl/RootUimaContext_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/impl/RootUimaContext_impl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/impl/RootUimaContext_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/impl/SofaID_impl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/impl/SofaID_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/impl/SofaID_impl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/impl/SofaID_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/impl/UIMAFramework_impl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/impl/UIMAFramework_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/impl/UIMAFramework_impl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/impl/UIMAFramework_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/impl/UimaContext_ImplBase.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/impl/UimaContext_ImplBase.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/impl/UimaContext_ImplBase.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/impl/UimaContext_ImplBase.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/impl/package.html b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/impl/package.html similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/impl/package.html rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/impl/package.html
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/AnalysisEnginePool.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/AnalysisEnginePool.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/AnalysisEnginePool.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/AnalysisEnginePool.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/ArrayUtils.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/ArrayUtils.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/ArrayUtils.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/ArrayUtils.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/BinaryTree.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/BinaryTree.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/BinaryTree.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/BinaryTree.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/BrowserUtil.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/BrowserUtil.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/BrowserUtil.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/BrowserUtil.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/CharArraySpanMap.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/CharArraySpanMap.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/CharArraySpanMap.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/CharArraySpanMap.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/CharArrayString.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/CharArrayString.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/CharArrayString.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/CharArrayString.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/CharacterUtils.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/CharacterUtils.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/CharacterUtils.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/CharacterUtils.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/CommandLineParser.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/CommandLineParser.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/CommandLineParser.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/CommandLineParser.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/ComparableIntIterator.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/ComparableIntIterator.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/ComparableIntIterator.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/ComparableIntIterator.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/ComparableIntPointerIterator.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/ComparableIntPointerIterator.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/ComparableIntPointerIterator.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/ComparableIntPointerIterator.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/EncodedPrintStream.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/EncodedPrintStream.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/EncodedPrintStream.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/EncodedPrintStream.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/Graph.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/Graph.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/Graph.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/Graph.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/GraphNode.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/GraphNode.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/GraphNode.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/GraphNode.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/I18nUtil.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/I18nUtil.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/I18nUtil.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/I18nUtil.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/InstrumentationFacility_impl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/InstrumentationFacility_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/InstrumentationFacility_impl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/InstrumentationFacility_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/IntArrayUtils.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/IntArrayUtils.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/IntArrayUtils.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/IntArrayUtils.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/IntComparator.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/IntComparator.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/IntComparator.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/IntComparator.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/IntListIterator.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/IntListIterator.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/IntListIterator.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/IntListIterator.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/IntPointerIterator.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/IntPointerIterator.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/IntPointerIterator.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/IntPointerIterator.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/IntSet.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/IntSet.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/IntSet.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/IntSet.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/IntStack.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/IntStack.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/IntStack.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/IntStack.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/IntVector.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/IntVector.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/IntVector.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/IntVector.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/JavaTimer.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/JavaTimer.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/JavaTimer.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/JavaTimer.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/JmxMBeanAgent.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/JmxMBeanAgent.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/JmxMBeanAgent.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/JmxMBeanAgent.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/MutableInteger.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/MutableInteger.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/MutableInteger.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/MutableInteger.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/ReplaceStringInFiles.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/ReplaceStringInFiles.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/ReplaceStringInFiles.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/ReplaceStringInFiles.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/ResourcePool.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/ResourcePool.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/ResourcePool.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/ResourcePool.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/SerializationUtils.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/SerializationUtils.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/SerializationUtils.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/SerializationUtils.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/SortedIntSet.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/SortedIntSet.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/SortedIntSet.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/SortedIntSet.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/StringToIntMap.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/StringToIntMap.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/StringToIntMap.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/StringToIntMap.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/StringUtils.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/StringUtils.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/StringUtils.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/StringUtils.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/SymbolTable.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/SymbolTable.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/SymbolTable.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/SymbolTable.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/SystemEnvReader.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/SystemEnvReader.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/SystemEnvReader.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/SystemEnvReader.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/TextAnalysisEnginePool.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/TextAnalysisEnginePool.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/TextAnalysisEnginePool.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/TextAnalysisEnginePool.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/TextStringTokenizer.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/TextStringTokenizer.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/TextStringTokenizer.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/TextStringTokenizer.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/TextTokenizer.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/TextTokenizer.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/TextTokenizer.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/TextTokenizer.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/TimeSpan.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/TimeSpan.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/TimeSpan.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/TimeSpan.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/Timer.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/Timer.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/Timer.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/Timer.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/UIMAClassLoader.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/UIMAClassLoader.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/UIMAClassLoader.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/UIMAClassLoader.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/UIMALogFormatter.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/UIMALogFormatter.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/UIMALogFormatter.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/UIMALogFormatter.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/UIMAStreamHandler.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/UIMAStreamHandler.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/UIMAStreamHandler.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/UIMAStreamHandler.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/UUIDGenerator.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/UUIDGenerator.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/UUIDGenerator.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/UUIDGenerator.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/UtilError.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/UtilError.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/UtilError.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/UtilError.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/XMLUtils.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/XMLUtils.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/XMLUtils.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/XMLUtils.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/XmlAttribute.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/XmlAttribute.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/XmlAttribute.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/XmlAttribute.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/XmlElementName.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/XmlElementName.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/XmlElementName.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/XmlElementName.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/XmlElementNameAndContents.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/XmlElementNameAndContents.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/XmlElementNameAndContents.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/XmlElementNameAndContents.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/CompIntArrayRBT.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/CompIntArrayRBT.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/CompIntArrayRBT.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/CompIntArrayRBT.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/IntArrayRBT.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/IntArrayRBT.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/IntArrayRBT.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/IntArrayRBT.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/IntRBTArray.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/IntRBTArray.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/IntRBTArray.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/IntRBTArray.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/IntRBTNode.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/IntRBTNode.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/IntRBTNode.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/IntRBTNode.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/IntRedBlackTree.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/IntRedBlackTree.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/IntRedBlackTree.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/IntRedBlackTree.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/RBTKeyValuePair.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/RBTKeyValuePair.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/RBTKeyValuePair.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/RBTKeyValuePair.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/RBTNode.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/RBTNode.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/RBTNode.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/RBTNode.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/RedBlackTree.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/RedBlackTree.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/RedBlackTree.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/RedBlackTree.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/text/INormalizationResult.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/text/INormalizationResult.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/text/INormalizationResult.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/text/INormalizationResult.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/text/INormalizerType1.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/text/INormalizerType1.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/internal/util/text/INormalizerType1.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/internal/util/text/INormalizerType1.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/JCas.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/JCas.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/JCas.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/JCas.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/JCasRegistry.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/JCasRegistry.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/JCasRegistry.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/JCasRegistry.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/JFSIndexRepository.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/JFSIndexRepository.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/JFSIndexRepository.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/JFSIndexRepository.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/AnnotationBase.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/AnnotationBase.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/AnnotationBase.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/AnnotationBase.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/AnnotationBase_Type.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/AnnotationBase_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/AnnotationBase_Type.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/AnnotationBase_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/BooleanArray.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/BooleanArray.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/BooleanArray.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/BooleanArray.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/BooleanArray_Type.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/BooleanArray_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/BooleanArray_Type.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/BooleanArray_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/ByteArray.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/ByteArray.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/ByteArray.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/ByteArray.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/ByteArray_Type.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/ByteArray_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/ByteArray_Type.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/ByteArray_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/CommonArray_Type.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/CommonArray_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/CommonArray_Type.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/CommonArray_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/DoubleArray.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/DoubleArray.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/DoubleArray.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/DoubleArray.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/DoubleArray_Type.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/DoubleArray_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/DoubleArray_Type.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/DoubleArray_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/EmptyFSList.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/EmptyFSList.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/EmptyFSList.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/EmptyFSList.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/EmptyFSList_Type.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/EmptyFSList_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/EmptyFSList_Type.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/EmptyFSList_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/EmptyFloatList.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/EmptyFloatList.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/EmptyFloatList.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/EmptyFloatList.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/EmptyFloatList_Type.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/EmptyFloatList_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/EmptyFloatList_Type.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/EmptyFloatList_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/EmptyIntegerList.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/EmptyIntegerList.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/EmptyIntegerList.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/EmptyIntegerList.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/EmptyIntegerList_Type.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/EmptyIntegerList_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/EmptyIntegerList_Type.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/EmptyIntegerList_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/EmptyStringList.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/EmptyStringList.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/EmptyStringList.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/EmptyStringList.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/EmptyStringList_Type.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/EmptyStringList_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/EmptyStringList_Type.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/EmptyStringList_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FSArray.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FSArray.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FSArray.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FSArray.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FSArray_Type.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FSArray_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FSArray_Type.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FSArray_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FSList.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FSList.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FSList.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FSList.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FSList_Type.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FSList_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FSList_Type.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FSList_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FloatArray.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FloatArray.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FloatArray.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FloatArray.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FloatArray_Type.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FloatArray_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FloatArray_Type.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FloatArray_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FloatList.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FloatList.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FloatList.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FloatList.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FloatList_Type.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FloatList_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FloatList_Type.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FloatList_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/IntegerArray.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/IntegerArray.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/IntegerArray.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/IntegerArray.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/IntegerArray_Type.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/IntegerArray_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/IntegerArray_Type.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/IntegerArray_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/IntegerList.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/IntegerList.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/IntegerList.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/IntegerList.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/IntegerList_Type.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/IntegerList_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/IntegerList_Type.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/IntegerList_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/LongArray.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/LongArray.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/LongArray.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/LongArray.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/LongArray_Type.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/LongArray_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/LongArray_Type.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/LongArray_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyFSList.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyFSList.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyFSList.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyFSList.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyFSList_Type.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyFSList_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyFSList_Type.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyFSList_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyFloatList.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyFloatList.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyFloatList.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyFloatList.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyFloatList_Type.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyFloatList_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyFloatList_Type.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyFloatList_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyIntegerList.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyIntegerList.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyIntegerList.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyIntegerList.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyIntegerList_Type.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyIntegerList_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyIntegerList_Type.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyIntegerList_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyStringList.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyStringList.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyStringList.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyStringList.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyStringList_Type.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyStringList_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyStringList_Type.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyStringList_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/ShortArray.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/ShortArray.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/ShortArray.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/ShortArray.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/ShortArray_Type.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/ShortArray_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/ShortArray_Type.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/ShortArray_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/Sofa.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/Sofa.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/Sofa.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/Sofa.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/Sofa_Type.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/Sofa_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/Sofa_Type.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/Sofa_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/StringArray.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/StringArray.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/StringArray.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/StringArray.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/StringArray_Type.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/StringArray_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/StringArray_Type.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/StringArray_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/StringList.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/StringList.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/StringList.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/StringList.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/StringList_Type.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/StringList_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/StringList_Type.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/StringList_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/TOP.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/TOP.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/TOP.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/TOP.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/TOP_Type.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/TOP_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/TOP_Type.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/TOP_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/package.html b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/package.html similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/cas/package.html rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/cas/package.html
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JCasHashMap.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JCasHashMap.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JCasHashMap.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JCasHashMap.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JCasImpl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JCasImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JCasImpl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JCasImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JFSIndexRepositoryImpl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JFSIndexRepositoryImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JFSIndexRepositoryImpl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JFSIndexRepositoryImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/impl/package.html b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/impl/package.html similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/impl/package.html rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/impl/package.html
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/package.html b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/package.html similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/package.html rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/package.html
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/tcas/Annotation.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/tcas/Annotation.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/tcas/Annotation.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/tcas/Annotation.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/tcas/Annotation_Type.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/tcas/Annotation_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/tcas/Annotation_Type.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/tcas/Annotation_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/tcas/package.html b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/tcas/package.html similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/jcas/tcas/package.html rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/jcas/tcas/package.html
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/package.html b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/package.html similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/package.html rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/package.html
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/pear/tools/InstallationController.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/pear/tools/InstallationController.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/pear/tools/InstallationController.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/pear/tools/InstallationController.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/pear/tools/InstallationDescriptor.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/pear/tools/InstallationDescriptor.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/pear/tools/InstallationDescriptor.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/pear/tools/InstallationDescriptor.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/pear/tools/InstallationDescriptorHandler.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/pear/tools/InstallationDescriptorHandler.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/pear/tools/InstallationDescriptorHandler.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/pear/tools/InstallationDescriptorHandler.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/pear/tools/InstallationProcessor.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/pear/tools/InstallationProcessor.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/pear/tools/InstallationProcessor.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/pear/tools/InstallationProcessor.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/pear/tools/InstallationTester.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/pear/tools/InstallationTester.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/pear/tools/InstallationTester.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/pear/tools/InstallationTester.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/pear/tools/LocalInstallationAgent.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/pear/tools/LocalInstallationAgent.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/pear/tools/LocalInstallationAgent.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/pear/tools/LocalInstallationAgent.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/pear/tools/PackageBrowser.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/pear/tools/PackageBrowser.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/pear/tools/PackageBrowser.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/pear/tools/PackageBrowser.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/pear/tools/PackageCreator.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/pear/tools/PackageCreator.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/pear/tools/PackageCreator.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/pear/tools/PackageCreator.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/pear/tools/PackageCreatorException.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/pear/tools/PackageCreatorException.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/pear/tools/PackageCreatorException.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/pear/tools/PackageCreatorException.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/pear/tools/PackageInstaller.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/pear/tools/PackageInstaller.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/pear/tools/PackageInstaller.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/pear/tools/PackageInstaller.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/pear/tools/PackageInstallerException.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/pear/tools/PackageInstallerException.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/pear/tools/PackageInstallerException.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/pear/tools/PackageInstallerException.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/pear/tools/PackageSelectorGUI.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/pear/tools/PackageSelectorGUI.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/pear/tools/PackageSelectorGUI.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/pear/tools/PackageSelectorGUI.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/pear/tools/SimplePackageSelector.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/pear/tools/SimplePackageSelector.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/pear/tools/SimplePackageSelector.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/pear/tools/SimplePackageSelector.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/pear/tools/package.html b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/pear/tools/package.html similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/pear/tools/package.html rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/pear/tools/package.html
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/pear/util/FileUtil.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/pear/util/FileUtil.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/pear/util/FileUtil.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/pear/util/FileUtil.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/pear/util/MessageRouter.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/pear/util/MessageRouter.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/pear/util/MessageRouter.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/pear/util/MessageRouter.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/pear/util/ProcessUtil.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/pear/util/ProcessUtil.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/pear/util/ProcessUtil.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/pear/util/ProcessUtil.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/pear/util/StringUtil.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/pear/util/StringUtil.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/pear/util/StringUtil.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/pear/util/StringUtil.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/pear/util/UIMAUtil.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/pear/util/UIMAUtil.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/pear/util/UIMAUtil.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/pear/util/UIMAUtil.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/pear/util/XMLUtil.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/pear/util/XMLUtil.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/pear/util/XMLUtil.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/pear/util/XMLUtil.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/pear/util/package.html b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/pear/util/package.html similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/pear/util/package.html rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/pear/util/package.html
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/CasDefinition.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/CasDefinition.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/CasDefinition.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/CasDefinition.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/CasManager.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/CasManager.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/CasManager.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/CasManager.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/ConfigurableDataResourceSpecifier.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/ConfigurableDataResourceSpecifier.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/ConfigurableDataResourceSpecifier.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/ConfigurableDataResourceSpecifier.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/ConfigurableResource.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/ConfigurableResource.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/ConfigurableResource.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/ConfigurableResource.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/ConfigurableResource_ImplBase.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/ConfigurableResource_ImplBase.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/ConfigurableResource_ImplBase.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/ConfigurableResource_ImplBase.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/ConfigurationManager.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/ConfigurationManager.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/ConfigurationManager.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/ConfigurationManager.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/CustomResourceSpecifier.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/CustomResourceSpecifier.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/CustomResourceSpecifier.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/CustomResourceSpecifier.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/DataResource.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/DataResource.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/DataResource.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/DataResource.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/ExternalResourceDependency.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/ExternalResourceDependency.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/ExternalResourceDependency.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/ExternalResourceDependency.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/ExternalResourceDescription.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/ExternalResourceDescription.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/ExternalResourceDescription.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/ExternalResourceDescription.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/FileLanguageResourceSpecifier.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/FileLanguageResourceSpecifier.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/FileLanguageResourceSpecifier.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/FileLanguageResourceSpecifier.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/FileResourceSpecifier.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/FileResourceSpecifier.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/FileResourceSpecifier.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/FileResourceSpecifier.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/JMSMessagingSpecifier.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/JMSMessagingSpecifier.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/JMSMessagingSpecifier.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/JMSMessagingSpecifier.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/MQMessagingSpecifier.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/MQMessagingSpecifier.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/MQMessagingSpecifier.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/MQMessagingSpecifier.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/MailMessagingSpecifier.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/MailMessagingSpecifier.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/MailMessagingSpecifier.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/MailMessagingSpecifier.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/ManagementObject.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/ManagementObject.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/ManagementObject.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/ManagementObject.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/MessagingSpecifier.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/MessagingSpecifier.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/MessagingSpecifier.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/MessagingSpecifier.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/Parameter.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/Parameter.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/Parameter.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/Parameter.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/ParameterizedDataResource.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/ParameterizedDataResource.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/ParameterizedDataResource.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/ParameterizedDataResource.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/PearSpecifier.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/PearSpecifier.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/PearSpecifier.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/PearSpecifier.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/RelativePathResolver.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/RelativePathResolver.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/RelativePathResolver.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/RelativePathResolver.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/Resource.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/Resource.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/Resource.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/Resource.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/ResourceAccessException.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/ResourceAccessException.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/ResourceAccessException.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/ResourceAccessException.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/ResourceConfigurationException.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/ResourceConfigurationException.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/ResourceConfigurationException.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/ResourceConfigurationException.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/ResourceCreationSpecifier.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/ResourceCreationSpecifier.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/ResourceCreationSpecifier.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/ResourceCreationSpecifier.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/ResourceInitializationException.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/ResourceInitializationException.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/ResourceInitializationException.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/ResourceInitializationException.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/ResourceManager.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/ResourceManager.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/ResourceManager.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/ResourceManager.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/ResourceProcessException.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/ResourceProcessException.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/ResourceProcessException.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/ResourceProcessException.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/ResourceServiceException.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/ResourceServiceException.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/ResourceServiceException.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/ResourceServiceException.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/ResourceServiceSpecifier.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/ResourceServiceSpecifier.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/ResourceServiceSpecifier.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/ResourceServiceSpecifier.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/ResourceServiceStub.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/ResourceServiceStub.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/ResourceServiceStub.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/ResourceServiceStub.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/ResourceSpecifier.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/ResourceSpecifier.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/ResourceSpecifier.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/ResourceSpecifier.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/ResourceSpecifierList.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/ResourceSpecifierList.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/ResourceSpecifierList.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/ResourceSpecifierList.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/Resource_ImplBase.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/Resource_ImplBase.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/Resource_ImplBase.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/Resource_ImplBase.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/Session.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/Session.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/Session.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/Session.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/SharedResourceObject.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/SharedResourceObject.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/SharedResourceObject.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/SharedResourceObject.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/URISpecifier.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/URISpecifier.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/URISpecifier.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/URISpecifier.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/impl/CasManager_impl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/impl/CasManager_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/impl/CasManager_impl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/impl/CasManager_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/impl/ConfigurableDataResourceSpecifier_impl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/impl/ConfigurableDataResourceSpecifier_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/impl/ConfigurableDataResourceSpecifier_impl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/impl/ConfigurableDataResourceSpecifier_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/impl/ConfigurableDataResource_impl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/impl/ConfigurableDataResource_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/impl/ConfigurableDataResource_impl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/impl/ConfigurableDataResource_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/impl/ConfigurationManagerImplBase.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/impl/ConfigurationManagerImplBase.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/impl/ConfigurationManagerImplBase.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/impl/ConfigurationManagerImplBase.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/impl/ConfigurationManager_impl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/impl/ConfigurationManager_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/impl/ConfigurationManager_impl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/impl/ConfigurationManager_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/impl/CustomResourceSpecifier_impl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/impl/CustomResourceSpecifier_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/impl/CustomResourceSpecifier_impl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/impl/CustomResourceSpecifier_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/impl/DataResource_impl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/impl/DataResource_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/impl/DataResource_impl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/impl/DataResource_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/impl/ExternalResourceDependency_impl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/impl/ExternalResourceDependency_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/impl/ExternalResourceDependency_impl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/impl/ExternalResourceDependency_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/impl/ExternalResourceDescription_impl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/impl/ExternalResourceDescription_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/impl/ExternalResourceDescription_impl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/impl/ExternalResourceDescription_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/impl/FileLanguageResourceSpecifier_impl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/impl/FileLanguageResourceSpecifier_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/impl/FileLanguageResourceSpecifier_impl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/impl/FileLanguageResourceSpecifier_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/impl/FileLanguageResource_impl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/impl/FileLanguageResource_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/impl/FileLanguageResource_impl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/impl/FileLanguageResource_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/impl/FileResourceSpecifier_impl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/impl/FileResourceSpecifier_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/impl/FileResourceSpecifier_impl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/impl/FileResourceSpecifier_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/impl/Parameter_impl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/impl/Parameter_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/impl/Parameter_impl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/impl/Parameter_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/impl/PearSpecifier_impl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/impl/PearSpecifier_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/impl/PearSpecifier_impl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/impl/PearSpecifier_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/impl/RelativePathResolver_impl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/impl/RelativePathResolver_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/impl/RelativePathResolver_impl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/impl/RelativePathResolver_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/impl/ResourceCreationSpecifier_impl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/impl/ResourceCreationSpecifier_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/impl/ResourceCreationSpecifier_impl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/impl/ResourceCreationSpecifier_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/impl/ResourceManager_impl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/impl/ResourceManager_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/impl/ResourceManager_impl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/impl/ResourceManager_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/impl/ResourceState_impl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/impl/ResourceState_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/impl/ResourceState_impl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/impl/ResourceState_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/impl/SessionNamespaceView_impl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/impl/SessionNamespaceView_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/impl/SessionNamespaceView_impl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/impl/SessionNamespaceView_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/impl/Session_impl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/impl/Session_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/impl/Session_impl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/impl/Session_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/impl/URISpecifier_impl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/impl/URISpecifier_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/impl/URISpecifier_impl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/impl/URISpecifier_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/AllowedValue.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/AllowedValue.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/AllowedValue.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/AllowedValue.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/Capability.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/Capability.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/Capability.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/Capability.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/ConfigurationGroup.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/ConfigurationGroup.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/ConfigurationGroup.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/ConfigurationGroup.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/ConfigurationParameter.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/ConfigurationParameter.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/ConfigurationParameter.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/ConfigurationParameter.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/ConfigurationParameterDeclarations.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/ConfigurationParameterDeclarations.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/ConfigurationParameterDeclarations.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/ConfigurationParameterDeclarations.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/ConfigurationParameterSettings.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/ConfigurationParameterSettings.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/ConfigurationParameterSettings.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/ConfigurationParameterSettings.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/ExternalResourceBinding.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/ExternalResourceBinding.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/ExternalResourceBinding.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/ExternalResourceBinding.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/FeatureDescription.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/FeatureDescription.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/FeatureDescription.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/FeatureDescription.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/FsIndexCollection.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/FsIndexCollection.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/FsIndexCollection.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/FsIndexCollection.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/FsIndexDescription.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/FsIndexDescription.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/FsIndexDescription.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/FsIndexDescription.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/FsIndexKeyDescription.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/FsIndexKeyDescription.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/FsIndexKeyDescription.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/FsIndexKeyDescription.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/Import.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/Import.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/Import.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/Import.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/LanguagePrecondition.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/LanguagePrecondition.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/LanguagePrecondition.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/LanguagePrecondition.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/MetaDataObject.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/MetaDataObject.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/MetaDataObject.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/MetaDataObject.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/MimeTypePrecondition.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/MimeTypePrecondition.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/MimeTypePrecondition.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/MimeTypePrecondition.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/NameValuePair.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/NameValuePair.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/NameValuePair.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/NameValuePair.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/OperationalProperties.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/OperationalProperties.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/OperationalProperties.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/OperationalProperties.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/Precondition.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/Precondition.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/Precondition.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/Precondition.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/ProcessingResourceMetaData.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/ProcessingResourceMetaData.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/ProcessingResourceMetaData.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/ProcessingResourceMetaData.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/ResourceManagerConfiguration.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/ResourceManagerConfiguration.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/ResourceManagerConfiguration.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/ResourceManagerConfiguration.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/ResourceMetaData.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/ResourceMetaData.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/ResourceMetaData.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/ResourceMetaData.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/SimplePrecondition.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/SimplePrecondition.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/SimplePrecondition.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/SimplePrecondition.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/TypeDescription.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/TypeDescription.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/TypeDescription.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/TypeDescription.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/TypePriorities.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/TypePriorities.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/TypePriorities.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/TypePriorities.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/TypePriorityList.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/TypePriorityList.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/TypePriorityList.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/TypePriorityList.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/TypeSystemDescription.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/TypeSystemDescription.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/TypeSystemDescription.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/TypeSystemDescription.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/AllowedValue_impl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/AllowedValue_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/AllowedValue_impl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/AllowedValue_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/Capability_impl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/Capability_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/Capability_impl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/Capability_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ConfigurationGroup_impl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ConfigurationGroup_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ConfigurationGroup_impl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ConfigurationGroup_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ConfigurationParameterDeclarations_impl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ConfigurationParameterDeclarations_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ConfigurationParameterDeclarations_impl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ConfigurationParameterDeclarations_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ConfigurationParameterSettings_impl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ConfigurationParameterSettings_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ConfigurationParameterSettings_impl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ConfigurationParameterSettings_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ConfigurationParameter_impl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ConfigurationParameter_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ConfigurationParameter_impl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ConfigurationParameter_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ExternalResourceBinding_impl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ExternalResourceBinding_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ExternalResourceBinding_impl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ExternalResourceBinding_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/FeatureDescription_impl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/FeatureDescription_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/FeatureDescription_impl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/FeatureDescription_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/FsIndexCollection_impl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/FsIndexCollection_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/FsIndexCollection_impl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/FsIndexCollection_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/FsIndexDescription_impl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/FsIndexDescription_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/FsIndexDescription_impl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/FsIndexDescription_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/FsIndexKeyDescription_impl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/FsIndexKeyDescription_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/FsIndexKeyDescription_impl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/FsIndexKeyDescription_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/Import_impl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/Import_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/Import_impl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/Import_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/LanguagePrecondition_impl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/LanguagePrecondition_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/LanguagePrecondition_impl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/LanguagePrecondition_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/MetaDataObject_impl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/MetaDataObject_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/MetaDataObject_impl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/MetaDataObject_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/MimeTypePrecondition_impl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/MimeTypePrecondition_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/MimeTypePrecondition_impl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/MimeTypePrecondition_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/NameValuePair_impl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/NameValuePair_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/NameValuePair_impl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/NameValuePair_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/OperationalProperties_impl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/OperationalProperties_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/OperationalProperties_impl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/OperationalProperties_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ProcessingResourceMetaData_impl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ProcessingResourceMetaData_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ProcessingResourceMetaData_impl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ProcessingResourceMetaData_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/PropertyXmlInfo.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/PropertyXmlInfo.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/PropertyXmlInfo.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/PropertyXmlInfo.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ResourceManagerConfiguration_impl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ResourceManagerConfiguration_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ResourceManagerConfiguration_impl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ResourceManagerConfiguration_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ResourceMetaData_impl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ResourceMetaData_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ResourceMetaData_impl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ResourceMetaData_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/SimplePrecondition_impl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/SimplePrecondition_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/SimplePrecondition_impl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/SimplePrecondition_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/TypeDescription_impl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/TypeDescription_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/TypeDescription_impl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/TypeDescription_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/TypePriorities_impl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/TypePriorities_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/TypePriorities_impl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/TypePriorities_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/TypePriorityList_impl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/TypePriorityList_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/TypePriorityList_impl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/TypePriorityList_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/TypeSystemDescription_impl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/TypeSystemDescription_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/TypeSystemDescription_impl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/TypeSystemDescription_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/XmlizationInfo.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/XmlizationInfo.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/XmlizationInfo.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/XmlizationInfo.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/package.html b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/package.html similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/metadata/package.html rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/metadata/package.html
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/package.html b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/package.html similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/package.html rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/package.html
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/service/impl/ResourceServiceAdapter.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/service/impl/ResourceServiceAdapter.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/service/impl/ResourceServiceAdapter.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/service/impl/ResourceServiceAdapter.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/service/impl/ResourceService_impl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/service/impl/ResourceService_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/resource/service/impl/ResourceService_impl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/resource/service/impl/ResourceService_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/search/Attribute.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/search/Attribute.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/search/Attribute.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/search/Attribute.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/search/Filter.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/search/Filter.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/search/Filter.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/search/Filter.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/search/IndexBuildItem.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/search/IndexBuildItem.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/search/IndexBuildItem.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/search/IndexBuildItem.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/search/IndexBuildSpecification.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/search/IndexBuildSpecification.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/search/IndexBuildSpecification.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/search/IndexBuildSpecification.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/search/IndexRule.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/search/IndexRule.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/search/IndexRule.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/search/IndexRule.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/search/IndexingException.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/search/IndexingException.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/search/IndexingException.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/search/IndexingException.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/search/Mapping.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/search/Mapping.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/search/Mapping.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/search/Mapping.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/search/Style.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/search/Style.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/search/Style.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/search/Style.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/search/impl/Attribute_impl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/search/impl/Attribute_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/search/impl/Attribute_impl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/search/impl/Attribute_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/search/impl/Filter_impl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/search/impl/Filter_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/search/impl/Filter_impl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/search/impl/Filter_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/search/impl/IndexBuildItem_impl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/search/impl/IndexBuildItem_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/search/impl/IndexBuildItem_impl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/search/impl/IndexBuildItem_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/search/impl/IndexBuildSpecification_impl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/search/impl/IndexBuildSpecification_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/search/impl/IndexBuildSpecification_impl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/search/impl/IndexBuildSpecification_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/search/impl/IndexRule_impl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/search/impl/IndexRule_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/search/impl/IndexRule_impl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/search/impl/IndexRule_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/search/impl/Mapping_impl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/search/impl/Mapping_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/search/impl/Mapping_impl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/search/impl/Mapping_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/search/impl/Style_impl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/search/impl/Style_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/search/impl/Style_impl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/search/impl/Style_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/search/impl/package.html b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/search/impl/package.html similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/search/impl/package.html rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/search/impl/package.html
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/search/package.html b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/search/package.html similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/search/package.html rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/search/package.html
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/uimacpp/CppUimajEngine.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/uimacpp/CppUimajEngine.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/uimacpp/CppUimajEngine.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/uimacpp/CppUimajEngine.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/uimacpp/UimacppAnalysisComponent.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/uimacpp/UimacppAnalysisComponent.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/uimacpp/UimacppAnalysisComponent.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/uimacpp/UimacppAnalysisComponent.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/uimacpp/UimacppEngine.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/uimacpp/UimacppEngine.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/uimacpp/UimacppEngine.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/uimacpp/UimacppEngine.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/uimacpp/UimacppException.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/uimacpp/UimacppException.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/uimacpp/UimacppException.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/uimacpp/UimacppException.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/util/AnalysisEnginePerformanceReports.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/util/AnalysisEnginePerformanceReports.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/util/AnalysisEnginePerformanceReports.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/util/AnalysisEnginePerformanceReports.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/util/AnalysisEngineUtils.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/util/AnalysisEngineUtils.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/util/AnalysisEngineUtils.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/util/AnalysisEngineUtils.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/util/CasCopier.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/util/CasCopier.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/util/CasCopier.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/util/CasCopier.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/util/CasCreationUtils.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/util/CasCreationUtils.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/util/CasCreationUtils.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/util/CasCreationUtils.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/util/CasPool.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/util/CasPool.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/util/CasPool.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/util/CasPool.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/util/CasPoolManagement.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/util/CasPoolManagement.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/util/CasPoolManagement.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/util/CasPoolManagement.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/util/CasToInlineXml.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/util/CasToInlineXml.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/util/CasToInlineXml.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/util/CasToInlineXml.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/util/ConsumerCasUtils.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/util/ConsumerCasUtils.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/util/ConsumerCasUtils.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/util/ConsumerCasUtils.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/util/FileUtils.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/util/FileUtils.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/util/FileUtils.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/util/FileUtils.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/util/InstrumentationFacility.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/util/InstrumentationFacility.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/util/InstrumentationFacility.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/util/InstrumentationFacility.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/util/InvalidXMLException.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/util/InvalidXMLException.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/util/InvalidXMLException.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/util/InvalidXMLException.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/util/JCasPool.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/util/JCasPool.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/util/JCasPool.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/util/JCasPool.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/util/Level.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/util/Level.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/util/Level.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/util/Level.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/util/Logger.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/util/Logger.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/util/Logger.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/util/Logger.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/util/LoggerPrintStream.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/util/LoggerPrintStream.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/util/LoggerPrintStream.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/util/LoggerPrintStream.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/util/NameClassPair.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/util/NameClassPair.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/util/NameClassPair.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/util/NameClassPair.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/util/ProcessTrace.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/util/ProcessTrace.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/util/ProcessTrace.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/util/ProcessTrace.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/util/ProcessTraceEvent.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/util/ProcessTraceEvent.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/util/ProcessTraceEvent.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/util/ProcessTraceEvent.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/util/Progress.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/util/Progress.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/util/Progress.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/util/Progress.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/util/ProgressImpl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/util/ProgressImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/util/ProgressImpl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/util/ProgressImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/util/SaxDeserializer.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/util/SaxDeserializer.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/util/SaxDeserializer.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/util/SaxDeserializer.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/util/SimpleResourceFactory.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/util/SimpleResourceFactory.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/util/SimpleResourceFactory.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/util/SimpleResourceFactory.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/util/TCasFormatter.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/util/TCasFormatter.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/util/TCasFormatter.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/util/TCasFormatter.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/util/TCasToInlineXml.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/util/TCasToInlineXml.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/util/TCasToInlineXml.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/util/TCasToInlineXml.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/util/TypeSystemUtil.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/util/TypeSystemUtil.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/util/TypeSystemUtil.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/util/TypeSystemUtil.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/util/UimaTimer.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/util/UimaTimer.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/util/UimaTimer.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/util/UimaTimer.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/util/XMLInputSource.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/util/XMLInputSource.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/util/XMLInputSource.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/util/XMLInputSource.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/util/XMLParser.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/util/XMLParser.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/util/XMLParser.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/util/XMLParser.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/util/XMLSerializer.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/util/XMLSerializer.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/util/XMLSerializer.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/util/XMLSerializer.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/util/XMLizable.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/util/XMLizable.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/util/XMLizable.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/util/XMLizable.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/util/XmlCasDeserializer.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/util/XmlCasDeserializer.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/util/XmlCasDeserializer.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/util/XmlCasDeserializer.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/util/XmlCasSerializer.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/util/XmlCasSerializer.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/util/XmlCasSerializer.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/util/XmlCasSerializer.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/util/impl/CasPoolManagementImpl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/util/impl/CasPoolManagementImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/util/impl/CasPoolManagementImpl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/util/impl/CasPoolManagementImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/util/impl/CasPoolManagementImplMBean.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/util/impl/CasPoolManagementImplMBean.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/util/impl/CasPoolManagementImplMBean.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/util/impl/CasPoolManagementImplMBean.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/util/impl/JSR47Logger_impl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/util/impl/JSR47Logger_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/util/impl/JSR47Logger_impl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/util/impl/JSR47Logger_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/util/impl/Logger_impl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/util/impl/Logger_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/util/impl/Logger_impl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/util/impl/Logger_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/util/impl/ProcessTraceEvent_impl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/util/impl/ProcessTraceEvent_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/util/impl/ProcessTraceEvent_impl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/util/impl/ProcessTraceEvent_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/util/impl/ProcessTrace_impl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/util/impl/ProcessTrace_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/util/impl/ProcessTrace_impl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/util/impl/ProcessTrace_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/util/impl/SaxDeserializer_impl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/util/impl/SaxDeserializer_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/util/impl/SaxDeserializer_impl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/util/impl/SaxDeserializer_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/util/impl/XMLParser_impl.java b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/util/impl/XMLParser_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/util/impl/XMLParser_impl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/util/impl/XMLParser_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/util/package.html b/uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/util/package.html similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/java/org/apache/uima/util/package.html rename to uimaj-2.2.1-incubating/uimaj-core/src/main/java/org/apache/uima/util/package.html
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/resources/org/apache/uima/UIMAException_Messages.properties b/uimaj-2.2.1-incubating/uimaj-core/src/main/resources/org/apache/uima/UIMAException_Messages.properties similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/resources/org/apache/uima/UIMAException_Messages.properties rename to uimaj-2.2.1-incubating/uimaj-core/src/main/resources/org/apache/uima/UIMAException_Messages.properties
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/resources/org/apache/uima/cas/admin/admin_errors.properties b/uimaj-2.2.1-incubating/uimaj-core/src/main/resources/org/apache/uima/cas/admin/admin_errors.properties similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/resources/org/apache/uima/cas/admin/admin_errors.properties rename to uimaj-2.2.1-incubating/uimaj-core/src/main/resources/org/apache/uima/cas/admin/admin_errors.properties
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/resources/org/apache/uima/cas/impl/annot_impl.properties b/uimaj-2.2.1-incubating/uimaj-core/src/main/resources/org/apache/uima/cas/impl/annot_impl.properties similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/resources/org/apache/uima/cas/impl/annot_impl.properties rename to uimaj-2.2.1-incubating/uimaj-core/src/main/resources/org/apache/uima/cas/impl/annot_impl.properties
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/resources/org/apache/uima/cas/impl/ll_runtimeException.properties b/uimaj-2.2.1-incubating/uimaj-core/src/main/resources/org/apache/uima/cas/impl/ll_runtimeException.properties similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/resources/org/apache/uima/cas/impl/ll_runtimeException.properties rename to uimaj-2.2.1-incubating/uimaj-core/src/main/resources/org/apache/uima/cas/impl/ll_runtimeException.properties
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/resources/org/apache/uima/cas/impl/xcas.properties b/uimaj-2.2.1-incubating/uimaj-core/src/main/resources/org/apache/uima/cas/impl/xcas.properties similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/resources/org/apache/uima/cas/impl/xcas.properties rename to uimaj-2.2.1-incubating/uimaj-core/src/main/resources/org/apache/uima/cas/impl/xcas.properties
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/resources/org/apache/uima/examples/SourceDocumentInformation.xml b/uimaj-2.2.1-incubating/uimaj-core/src/main/resources/org/apache/uima/examples/SourceDocumentInformation.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/resources/org/apache/uima/examples/SourceDocumentInformation.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/main/resources/org/apache/uima/examples/SourceDocumentInformation.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/resources/org/apache/uima/flow/CapabilityLanguageFlowController.xml b/uimaj-2.2.1-incubating/uimaj-core/src/main/resources/org/apache/uima/flow/CapabilityLanguageFlowController.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/resources/org/apache/uima/flow/CapabilityLanguageFlowController.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/main/resources/org/apache/uima/flow/CapabilityLanguageFlowController.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/resources/org/apache/uima/flow/FixedFlowController.xml b/uimaj-2.2.1-incubating/uimaj-core/src/main/resources/org/apache/uima/flow/FixedFlowController.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/resources/org/apache/uima/flow/FixedFlowController.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/main/resources/org/apache/uima/flow/FixedFlowController.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/resources/org/apache/uima/impl/factoryConfig.xml b/uimaj-2.2.1-incubating/uimaj-core/src/main/resources/org/apache/uima/impl/factoryConfig.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/resources/org/apache/uima/impl/factoryConfig.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/main/resources/org/apache/uima/impl/factoryConfig.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/resources/org/apache/uima/impl/log_messages.properties b/uimaj-2.2.1-incubating/uimaj-core/src/main/resources/org/apache/uima/impl/log_messages.properties similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/resources/org/apache/uima/impl/log_messages.properties rename to uimaj-2.2.1-incubating/uimaj-core/src/main/resources/org/apache/uima/impl/log_messages.properties
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/resources/org/apache/uima/impl/performanceTuning.properties b/uimaj-2.2.1-incubating/uimaj-core/src/main/resources/org/apache/uima/impl/performanceTuning.properties similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/resources/org/apache/uima/impl/performanceTuning.properties rename to uimaj-2.2.1-incubating/uimaj-core/src/main/resources/org/apache/uima/impl/performanceTuning.properties
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/resources/org/apache/uima/internal/util/util_error.properties b/uimaj-2.2.1-incubating/uimaj-core/src/main/resources/org/apache/uima/internal/util/util_error.properties similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/resources/org/apache/uima/internal/util/util_error.properties rename to uimaj-2.2.1-incubating/uimaj-core/src/main/resources/org/apache/uima/internal/util/util_error.properties
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/resources/org/apache/uima/pear/pear_messages.properties b/uimaj-2.2.1-incubating/uimaj-core/src/main/resources/org/apache/uima/pear/pear_messages.properties similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/resources/org/apache/uima/pear/pear_messages.properties rename to uimaj-2.2.1-incubating/uimaj-core/src/main/resources/org/apache/uima/pear/pear_messages.properties
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/resources/resourceSpecifierSchema.xsd b/uimaj-2.2.1-incubating/uimaj-core/src/main/resources/resourceSpecifierSchema.xsd similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/resources/resourceSpecifierSchema.xsd rename to uimaj-2.2.1-incubating/uimaj-core/src/main/resources/resourceSpecifierSchema.xsd
diff --git a/uimaj-2.2.1-06/uimaj-core/src/main/resources/uima.ecore b/uimaj-2.2.1-incubating/uimaj-core/src/main/resources/uima.ecore similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/main/resources/uima.ecore rename to uimaj-2.2.1-incubating/uimaj-core/src/main/resources/uima.ecore
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/aa/AbstractType.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/aa/AbstractType.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/aa/AbstractType.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/aa/AbstractType.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/aa/AbstractType_Type.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/aa/AbstractType_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/aa/AbstractType_Type.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/aa/AbstractType_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/aa/ConcreteType.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/aa/ConcreteType.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/aa/ConcreteType.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/aa/ConcreteType.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/aa/ConcreteType_Type.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/aa/ConcreteType_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/aa/ConcreteType_Type.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/aa/ConcreteType_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/aa/MissingFeatureInCas.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/aa/MissingFeatureInCas.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/aa/MissingFeatureInCas.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/aa/MissingFeatureInCas.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/aa/MissingFeatureInCas_Type.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/aa/MissingFeatureInCas_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/aa/MissingFeatureInCas_Type.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/aa/MissingFeatureInCas_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/aa/MissingInCas.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/aa/MissingInCas.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/aa/MissingInCas.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/aa/MissingInCas.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/aa/MissingInCas_Type.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/aa/MissingInCas_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/aa/MissingInCas_Type.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/aa/MissingInCas_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/aa/Root.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/aa/Root.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/aa/Root.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/aa/Root.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/aa/Root_Type.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/aa/Root_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/aa/Root_Type.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/aa/Root_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/lang/LanguagePair.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/lang/LanguagePair.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/lang/LanguagePair.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/lang/LanguagePair.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/lang/LanguagePair_Type.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/lang/LanguagePair_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/lang/LanguagePair_Type.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/lang/LanguagePair_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngineDescription_implTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngineDescription_implTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngineDescription_implTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngineDescription_implTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngine_implTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngine_implTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngine_implTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngine_implTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnnotationWriter.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnnotationWriter.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnnotationWriter.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnnotationWriter.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnnotatorContext_implTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnnotatorContext_implTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnnotatorContext_implTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnnotatorContext_implTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnnotatorForCollectionProcessCompleteTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnnotatorForCollectionProcessCompleteTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnnotatorForCollectionProcessCompleteTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnnotatorForCollectionProcessCompleteTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/BadSegmenter.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/BadSegmenter.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/BadSegmenter.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/BadSegmenter.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/ErrorAnnotator.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/ErrorAnnotator.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/ErrorAnnotator.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/ErrorAnnotator.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/FlowControllerForErrorTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/FlowControllerForErrorTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/FlowControllerForErrorTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/FlowControllerForErrorTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/MultiprocessingAnalysisEngine_implTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/MultiprocessingAnalysisEngine_implTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/MultiprocessingAnalysisEngine_implTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/MultiprocessingAnalysisEngine_implTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/NewlineResegmenter.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/NewlineResegmenter.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/NewlineResegmenter.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/NewlineResegmenter.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/NewlineSegmenter.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/NewlineSegmenter.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/NewlineSegmenter.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/NewlineSegmenter.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/ParallelFlowController.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/ParallelFlowController.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/ParallelFlowController.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/ParallelFlowController.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/ResultSpecification_implTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/ResultSpecification_implTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/ResultSpecification_implTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/ResultSpecification_implTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/SegmentDroppingFlowController.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/SegmentDroppingFlowController.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/SegmentDroppingFlowController.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/SegmentDroppingFlowController.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/TabSegmenter.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/TabSegmenter.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/TabSegmenter.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/TabSegmenter.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/TaeDescription_implTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/TaeDescription_implTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/TaeDescription_implTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/TaeDescription_implTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/TestAnnotator.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/TestAnnotator.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/TestAnnotator.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/TestAnnotator.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/TestAnnotator2.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/TestAnnotator2.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/TestAnnotator2.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/TestAnnotator2.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/metadata/SofaMapping_implTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/metadata/SofaMapping_implTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/metadata/SofaMapping_implTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/metadata/SofaMapping_implTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/sequencer/SequencerCapabilityLanguageTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/sequencer/SequencerCapabilityLanguageTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/sequencer/SequencerCapabilityLanguageTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/sequencer/SequencerCapabilityLanguageTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/sequencer/SequencerFixedTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/sequencer/SequencerFixedTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/sequencer/SequencerFixedTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/sequencer/SequencerFixedTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/sequencer/SequencerTestAnnotator.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/sequencer/SequencerTestAnnotator.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/sequencer/SequencerTestAnnotator.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/sequencer/SequencerTestAnnotator.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/impl/CasPerformanceTuningSettingsTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/impl/CasPerformanceTuningSettingsTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/impl/CasPerformanceTuningSettingsTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/impl/CasPerformanceTuningSettingsTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/impl/CasPoolTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/impl/CasPoolTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/impl/CasPoolTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/impl/CasPoolTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/impl/CasResetResizeTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/impl/CasResetResizeTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/impl/CasResetResizeTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/impl/CasResetResizeTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/impl/ComponentInfoTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/impl/ComponentInfoTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/impl/ComponentInfoTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/impl/ComponentInfoTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/impl/UnambiguousIteratorTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/impl/UnambiguousIteratorTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/impl/UnambiguousIteratorTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/impl/UnambiguousIteratorTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/impl/XCASDeserializerTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/impl/XCASDeserializerTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/impl/XCASDeserializerTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/impl/XCASDeserializerTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/impl/XmiCasDeserializerTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/impl/XmiCasDeserializerTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/impl/XmiCasDeserializerTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/impl/XmiCasDeserializerTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/impl/XmiCasSerializerTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/impl/XmiCasSerializerTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/impl/XmiCasSerializerTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/impl/XmiCasSerializerTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/test/AnnotationIteratorTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/test/AnnotationIteratorTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/test/AnnotationIteratorTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/test/AnnotationIteratorTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/test/AnnotationTreeTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/test/AnnotationTreeTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/test/AnnotationTreeTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/test/AnnotationTreeTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/test/AnnotatorInitializer.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/test/AnnotatorInitializer.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/test/AnnotatorInitializer.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/test/AnnotatorInitializer.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/test/ArrayFSTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/test/ArrayFSTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/test/ArrayFSTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/test/ArrayFSTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/test/ArrayIndexTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/test/ArrayIndexTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/test/ArrayIndexTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/test/ArrayIndexTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/test/CASInitializer.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/test/CASInitializer.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/test/CASInitializer.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/test/CASInitializer.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/test/CASTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/test/CASTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/test/CASTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/test/CASTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/test/CASTestSetup.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/test/CASTestSetup.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/test/CASTestSetup.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/test/CASTestSetup.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/test/CompleteSerializationTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/test/CompleteSerializationTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/test/CompleteSerializationTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/test/CompleteSerializationTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/test/CrossAnnotation.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/test/CrossAnnotation.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/test/CrossAnnotation.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/test/CrossAnnotation.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/test/CrossAnnotation_Type.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/test/CrossAnnotation_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/test/CrossAnnotation_Type.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/test/CrossAnnotation_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/test/FeatureStructureTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/test/FeatureStructureTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/test/FeatureStructureTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/test/FeatureStructureTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/test/FilteredIteratorTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/test/FilteredIteratorTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/test/FilteredIteratorTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/test/FilteredIteratorTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/test/FloatArrayFSTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/test/FloatArrayFSTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/test/FloatArrayFSTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/test/FloatArrayFSTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/test/GetAllIndexedTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/test/GetAllIndexedTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/test/GetAllIndexedTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/test/GetAllIndexedTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/test/GrowingTheCasTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/test/GrowingTheCasTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/test/GrowingTheCasTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/test/GrowingTheCasTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/test/IndexComparitorTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/test/IndexComparitorTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/test/IndexComparitorTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/test/IndexComparitorTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/test/IndexRepositoryTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/test/IndexRepositoryTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/test/IndexRepositoryTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/test/IndexRepositoryTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/test/IndexSerializationTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/test/IndexSerializationTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/test/IndexSerializationTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/test/IndexSerializationTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/test/IntArrayFSTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/test/IntArrayFSTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/test/IntArrayFSTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/test/IntArrayFSTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/test/IteratorTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/test/IteratorTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/test/IteratorTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/test/IteratorTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/test/JcasSofaTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/test/JcasSofaTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/test/JcasSofaTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/test/JcasSofaTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/test/NewPrimitiveTypesTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/test/NewPrimitiveTypesTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/test/NewPrimitiveTypesTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/test/NewPrimitiveTypesTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/test/Sentence.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/test/Sentence.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/test/Sentence.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/test/Sentence.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/test/Sentence_Type.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/test/Sentence_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/test/Sentence_Type.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/test/Sentence_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/test/SerializationNoMDTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/test/SerializationNoMDTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/test/SerializationNoMDTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/test/SerializationNoMDTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/test/SerializationReinitTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/test/SerializationReinitTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/test/SerializationReinitTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/test/SerializationReinitTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/test/SofaTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/test/SofaTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/test/SofaTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/test/SofaTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/test/StringArrayTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/test/StringArrayTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/test/StringArrayTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/test/StringArrayTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/test/StringSubtypeAnnotation.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/test/StringSubtypeAnnotation.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/test/StringSubtypeAnnotation.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/test/StringSubtypeAnnotation.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/test/StringSubtypeAnnotation_Type.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/test/StringSubtypeAnnotation_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/test/StringSubtypeAnnotation_Type.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/test/StringSubtypeAnnotation_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/test/StringSubtypeTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/test/StringSubtypeTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/test/StringSubtypeTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/test/StringSubtypeTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/test/SubiteratorAnnotator.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/test/SubiteratorAnnotator.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/test/SubiteratorAnnotator.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/test/SubiteratorAnnotator.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/test/SubiteratorTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/test/SubiteratorTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/test/SubiteratorTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/test/SubiteratorTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/test/TestAnnotator.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/test/TestAnnotator.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/test/TestAnnotator.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/test/TestAnnotator.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/test/Token.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/test/Token.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/test/Token.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/test/Token.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/test/Token_Type.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/test/Token_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/test/Token_Type.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/test/Token_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/test/TypeOrderTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/test/TypeOrderTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/test/TypeOrderTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/test/TypeOrderTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/test/TypePriorityTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/test/TypePriorityTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/test/TypePriorityTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/test/TypePriorityTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/test/TypeSystemReinitTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/test/TypeSystemReinitTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/test/TypeSystemReinitTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/test/TypeSystemReinitTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/test/TypeSystemTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/test/TypeSystemTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/test/TypeSystemTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/test/TypeSystemTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/test/TypeSystemUtilsTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/test/TypeSystemUtilsTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/test/TypeSystemUtilsTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/test/TypeSystemUtilsTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/test/UimacppDeserializationTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/test/UimacppDeserializationTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas/test/UimacppDeserializationTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas/test/UimacppDeserializationTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas_data/impl/CasComparer.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas_data/impl/CasComparer.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas_data/impl/CasComparer.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas_data/impl/CasComparer.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas_data/impl/CasDataToXCasTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas_data/impl/CasDataToXCasTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas_data/impl/CasDataToXCasTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas_data/impl/CasDataToXCasTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas_data/impl/XCasToCasDataSaxHandlerTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas_data/impl/XCasToCasDataSaxHandlerTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/cas_data/impl/XCasToCasDataSaxHandlerTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/cas_data/impl/XCasToCasDataSaxHandlerTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/collection/impl/CasConsumerDescription_implTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/collection/impl/CasConsumerDescription_implTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/collection/impl/CasConsumerDescription_implTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/collection/impl/CasConsumerDescription_implTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/collection/impl/CasInitializerDescription_implTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/collection/impl/CasInitializerDescription_implTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/collection/impl/CasInitializerDescription_implTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/collection/impl/CasInitializerDescription_implTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/collection/impl/CollectionReaderDescription_implTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/collection/impl/CollectionReaderDescription_implTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/collection/impl/CollectionReaderDescription_implTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/collection/impl/CollectionReaderDescription_implTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/examples/cpm/sofa/TransAnnotator.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/examples/cpm/sofa/TransAnnotator.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/examples/cpm/sofa/TransAnnotator.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/examples/cpm/sofa/TransAnnotator.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/flow/impl/FixedFlowControllerTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/flow/impl/FixedFlowControllerTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/flow/impl/FixedFlowControllerTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/flow/impl/FixedFlowControllerTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/impl/AnalysisEngineFactory_implTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/impl/AnalysisEngineFactory_implTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/impl/AnalysisEngineFactory_implTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/impl/AnalysisEngineFactory_implTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/impl/CasConsumerFactory_implTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/impl/CasConsumerFactory_implTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/impl/CasConsumerFactory_implTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/impl/CasConsumerFactory_implTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/impl/CollectionReaderFactory_implTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/impl/CollectionReaderFactory_implTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/impl/CollectionReaderFactory_implTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/impl/CollectionReaderFactory_implTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/impl/CustomResourceSpecifierFactory_implTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/impl/CustomResourceSpecifierFactory_implTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/impl/CustomResourceSpecifierFactory_implTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/impl/CustomResourceSpecifierFactory_implTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/impl/SomeCustomResource.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/impl/SomeCustomResource.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/impl/SomeCustomResource.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/impl/SomeCustomResource.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/impl/UimaContext_implTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/impl/UimaContext_implTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/impl/UimaContext_implTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/impl/UimaContext_implTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/internal/util/AnalysisEnginePoolTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/internal/util/AnalysisEnginePoolTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/internal/util/AnalysisEnginePoolTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/internal/util/AnalysisEnginePoolTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/internal/util/ClassloadingTestClass.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/internal/util/ClassloadingTestClass.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/internal/util/ClassloadingTestClass.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/internal/util/ClassloadingTestClass.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/internal/util/ResourcePoolTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/internal/util/ResourcePoolTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/internal/util/ResourcePoolTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/internal/util/ResourcePoolTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/internal/util/UIMAClassLoaderTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/internal/util/UIMAClassLoaderTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/internal/util/UIMAClassLoaderTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/internal/util/UIMAClassLoaderTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/internal/util/XmlUtilsTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/internal/util/XmlUtilsTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/internal/util/XmlUtilsTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/internal/util/XmlUtilsTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/jcas/test/AnnotatorInitializer.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/jcas/test/AnnotatorInitializer.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/jcas/test/AnnotatorInitializer.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/jcas/test/AnnotatorInitializer.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/jcas/test/CASInitializer.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/jcas/test/CASInitializer.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/jcas/test/CASInitializer.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/jcas/test/CASInitializer.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/jcas/test/CASTestSetup.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/jcas/test/CASTestSetup.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/jcas/test/CASTestSetup.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/jcas/test/CASTestSetup.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/jcas/test/JCasTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/jcas/test/JCasTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/jcas/test/JCasTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/jcas/test/JCasTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/jcas/test/generatedx.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/jcas/test/generatedx.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/jcas/test/generatedx.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/jcas/test/generatedx.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/pear/util/ComponentCategoryTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/pear/util/ComponentCategoryTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/pear/util/ComponentCategoryTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/pear/util/ComponentCategoryTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/pear/util/PearEncodingTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/pear/util/PearEncodingTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/pear/util/PearEncodingTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/pear/util/PearEncodingTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/pear/util/PearInstallerTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/pear/util/PearInstallerTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/pear/util/PearInstallerTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/pear/util/PearInstallerTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/pear/util/PearRuntimeTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/pear/util/PearRuntimeTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/pear/util/PearRuntimeTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/pear/util/PearRuntimeTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/pear/util/TestPearInstallationVerification.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/pear/util/TestPearInstallationVerification.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/pear/util/TestPearInstallationVerification.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/pear/util/TestPearInstallationVerification.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/resource/ConfigurableResource_implTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/resource/ConfigurableResource_implTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/resource/ConfigurableResource_implTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/resource/ConfigurableResource_implTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/resource/TestCasConsumer.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/resource/TestCasConsumer.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/resource/TestCasConsumer.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/resource/TestCasConsumer.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/resource/impl/CasManager_implTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/resource/impl/CasManager_implTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/resource/impl/CasManager_implTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/resource/impl/CasManager_implTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/resource/impl/ConfigurableDataResourceSpecifier_implTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/resource/impl/ConfigurableDataResourceSpecifier_implTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/resource/impl/ConfigurableDataResourceSpecifier_implTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/resource/impl/ConfigurableDataResourceSpecifier_implTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/resource/impl/ConfigurableDataResource_implTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/resource/impl/ConfigurableDataResource_implTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/resource/impl/ConfigurableDataResource_implTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/resource/impl/ConfigurableDataResource_implTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/resource/impl/DataResource_implTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/resource/impl/DataResource_implTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/resource/impl/DataResource_implTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/resource/impl/DataResource_implTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/resource/impl/FileLanguageResource_implTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/resource/impl/FileLanguageResource_implTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/resource/impl/FileLanguageResource_implTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/resource/impl/FileLanguageResource_implTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/resource/impl/PearSpecifier_implTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/resource/impl/PearSpecifier_implTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/resource/impl/PearSpecifier_implTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/resource/impl/PearSpecifier_implTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/resource/impl/RelativePathResolver_implTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/resource/impl/RelativePathResolver_implTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/resource/impl/RelativePathResolver_implTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/resource/impl/RelativePathResolver_implTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/resource/impl/ResourceCreationSpecifier_implTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/resource/impl/ResourceCreationSpecifier_implTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/resource/impl/ResourceCreationSpecifier_implTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/resource/impl/ResourceCreationSpecifier_implTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/resource/impl/ResourceManager_implTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/resource/impl/ResourceManager_implTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/resource/impl/ResourceManager_implTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/resource/impl/ResourceManager_implTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/resource/impl/TestResourceInterface.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/resource/impl/TestResourceInterface.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/resource/impl/TestResourceInterface.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/resource/impl/TestResourceInterface.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/resource/impl/TestResourceInterface_impl.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/resource/impl/TestResourceInterface_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/resource/impl/TestResourceInterface_impl.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/resource/impl/TestResourceInterface_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/resource/impl/URISpecifier_implTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/resource/impl/URISpecifier_implTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/resource/impl/URISpecifier_implTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/resource/impl/URISpecifier_implTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/ConfigurationParameterDeclarations_implTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/ConfigurationParameterDeclarations_implTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/ConfigurationParameterDeclarations_implTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/ConfigurationParameterDeclarations_implTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/FsIndexCollection_implTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/FsIndexCollection_implTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/FsIndexCollection_implTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/FsIndexCollection_implTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/Import_implTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/Import_implTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/Import_implTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/Import_implTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/MetaDataObject_implTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/MetaDataObject_implTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/MetaDataObject_implTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/MetaDataObject_implTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/ResourceManagerConfiguration_implTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/ResourceManagerConfiguration_implTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/ResourceManagerConfiguration_implTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/ResourceManagerConfiguration_implTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/TestFruitBagObject.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/TestFruitBagObject.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/TestFruitBagObject.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/TestFruitBagObject.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/TestFruitObject.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/TestFruitObject.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/TestFruitObject.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/TestFruitObject.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/TypePriorities_implTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/TypePriorities_implTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/TypePriorities_implTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/TypePriorities_implTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/TypeSystemDescription_implTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/TypeSystemDescription_implTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/TypeSystemDescription_implTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/TypeSystemDescription_implTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/resource/service/impl/ResourceServiceAdapter_implTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/resource/service/impl/ResourceServiceAdapter_implTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/resource/service/impl/ResourceServiceAdapter_implTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/resource/service/impl/ResourceServiceAdapter_implTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/resource/service/impl/ResourceService_implTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/resource/service/impl/ResourceService_implTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/resource/service/impl/ResourceService_implTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/resource/service/impl/ResourceService_implTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/resource/service/impl/TestResourceServiceStub.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/resource/service/impl/TestResourceServiceStub.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/resource/service/impl/TestResourceServiceStub.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/resource/service/impl/TestResourceServiceStub.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/util/CasCopierTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/util/CasCopierTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/util/CasCopierTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/util/CasCopierTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/util/CasCreationUtilsTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/util/CasCreationUtilsTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/util/CasCreationUtilsTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/util/CasCreationUtilsTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/util/FileUtilsTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/util/FileUtilsTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/util/FileUtilsTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/util/FileUtilsTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/util/LevelTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/util/LevelTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/util/LevelTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/util/LevelTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/util/TestCollectionReader.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/util/TestCollectionReader.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/util/TestCollectionReader.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/util/TestCollectionReader.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/util/TypeSystemUtilTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/util/TypeSystemUtilTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/util/TypeSystemUtilTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/util/TypeSystemUtilTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/util/impl/JSR47Logger_implTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/util/impl/JSR47Logger_implTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/util/impl/JSR47Logger_implTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/util/impl/JSR47Logger_implTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/util/impl/Logger_implTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/util/impl/Logger_implTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/util/impl/Logger_implTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/util/impl/Logger_implTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/util/impl/LoggingTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/util/impl/LoggingTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/util/impl/LoggingTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/util/impl/LoggingTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/util/impl/ProcessTrace_implTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/util/impl/ProcessTrace_implTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/util/impl/ProcessTrace_implTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/util/impl/ProcessTrace_implTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/util/impl/XMLParser_implTest.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/util/impl/XMLParser_implTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/org/apache/uima/util/impl/XMLParser_implTest.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/org/apache/uima/util/impl/XMLParser_implTest.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/x/y/z/EndOfSentence.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/x/y/z/EndOfSentence.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/x/y/z/EndOfSentence.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/x/y/z/EndOfSentence.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/x/y/z/EndOfSentence_Type.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/x/y/z/EndOfSentence_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/x/y/z/EndOfSentence_Type.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/x/y/z/EndOfSentence_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/x/y/z/Sentence.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/x/y/z/Sentence.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/x/y/z/Sentence.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/x/y/z/Sentence.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/x/y/z/Sentence_Type.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/x/y/z/Sentence_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/x/y/z/Sentence_Type.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/x/y/z/Sentence_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/x/y/z/Separator.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/x/y/z/Separator.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/x/y/z/Separator.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/x/y/z/Separator.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/x/y/z/Separator_Type.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/x/y/z/Separator_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/x/y/z/Separator_Type.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/x/y/z/Separator_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/x/y/z/Token.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/x/y/z/Token.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/x/y/z/Token.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/x/y/z/Token.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/x/y/z/TokenType.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/x/y/z/TokenType.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/x/y/z/TokenType.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/x/y/z/TokenType.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/x/y/z/TokenType_Type.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/x/y/z/TokenType_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/x/y/z/TokenType_Type.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/x/y/z/TokenType_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/x/y/z/Token_Type.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/x/y/z/Token_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/x/y/z/Token_Type.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/x/y/z/Token_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/x/y/z/Word.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/x/y/z/Word.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/x/y/z/Word.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/x/y/z/Word.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/java/x/y/z/Word_Type.java b/uimaj-2.2.1-incubating/uimaj-core/src/test/java/x/y/z/Word_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/java/x/y/z/Word_Type.java rename to uimaj-2.2.1-incubating/uimaj-core/src/test/java/x/y/z/Word_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/AnnotatorContextTest/AggregateTaeWithConfigParamOverrides.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/AnnotatorContextTest/AggregateTaeWithConfigParamOverrides.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/AnnotatorContextTest/AggregateTaeWithConfigParamOverrides.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/AnnotatorContextTest/AggregateTaeWithConfigParamOverrides.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/AnnotatorContextTest/AnnotatorWithConfigurationGroups.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/AnnotatorContextTest/AnnotatorWithConfigurationGroups.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/AnnotatorContextTest/AnnotatorWithConfigurationGroups.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/AnnotatorContextTest/AnnotatorWithConfigurationGroups.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/AnnotatorContextTest/AnnotatorWithConfigurationParameters.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/AnnotatorContextTest/AnnotatorWithConfigurationParameters.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/AnnotatorContextTest/AnnotatorWithConfigurationParameters.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/AnnotatorContextTest/AnnotatorWithConfigurationParameters.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/AnnotatorContextTest/AnnotatorWithDefaultFallbackConfiguration.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/AnnotatorContextTest/AnnotatorWithDefaultFallbackConfiguration.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/AnnotatorContextTest/AnnotatorWithDefaultFallbackConfiguration.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/AnnotatorContextTest/AnnotatorWithDefaultFallbackConfiguration.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/AnnotatorContextTest/AnnotatorWithGroupsAndNonGroupParams.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/AnnotatorContextTest/AnnotatorWithGroupsAndNonGroupParams.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/AnnotatorContextTest/AnnotatorWithGroupsAndNonGroupParams.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/AnnotatorContextTest/AnnotatorWithGroupsAndNonGroupParams.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/AnnotatorContextTest/ResourceTestAnnotator.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/AnnotatorContextTest/ResourceTestAnnotator.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/AnnotatorContextTest/ResourceTestAnnotator.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/AnnotatorContextTest/ResourceTestAnnotator.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/AnnotatorContextTest/testDataFile.dat b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/AnnotatorContextTest/testDataFile.dat similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/AnnotatorContextTest/testDataFile.dat rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/AnnotatorContextTest/testDataFile.dat
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/AnnotatorContextTest/testDataFile2.dat b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/AnnotatorContextTest/testDataFile2.dat similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/AnnotatorContextTest/testDataFile2.dat rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/AnnotatorContextTest/testDataFile2.dat
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/AnnotatorContextTest/testDir/test.dat b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/AnnotatorContextTest/testDir/test.dat similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/AnnotatorContextTest/testDir/test.dat rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/AnnotatorContextTest/testDir/test.dat
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/CASTests/CasTypeOrderTestRef.txt b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/CASTests/CasTypeOrderTestRef.txt similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/CASTests/CasTypeOrderTestRef.txt rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/CASTests/CasTypeOrderTestRef.txt
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/CASTests/desc/ArrayIndexTest.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/CASTests/desc/ArrayIndexTest.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/CASTests/desc/ArrayIndexTest.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/CASTests/desc/ArrayIndexTest.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/CASTests/desc/StringSubtypeTest.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/CASTests/desc/StringSubtypeTest.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/CASTests/desc/StringSubtypeTest.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/CASTests/desc/StringSubtypeTest.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/CASTests/desc/TokensAndSentences.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/CASTests/desc/TokensAndSentences.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/CASTests/desc/TokensAndSentences.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/CASTests/desc/TokensAndSentences.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/CASTests/desc/TokensAndSentencesTS.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/CASTests/desc/TokensAndSentencesTS.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/CASTests/desc/TokensAndSentencesTS.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/CASTests/desc/TokensAndSentencesTS.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/CASTests/desc/casTestCaseDescriptor.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/CASTests/desc/casTestCaseDescriptor.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/CASTests/desc/casTestCaseDescriptor.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/CASTests/desc/casTestCaseDescriptor.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/CASTests/desc/casTestCaseTypesystem.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/CASTests/desc/casTestCaseTypesystem.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/CASTests/desc/casTestCaseTypesystem.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/CASTests/desc/casTestCaseTypesystem.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/CASTests/desc/pathValidationTS.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/CASTests/desc/pathValidationTS.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/CASTests/desc/pathValidationTS.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/CASTests/desc/pathValidationTS.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/CASTests/desc/typePriorityTestCaseDescriptor.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/CASTests/desc/typePriorityTestCaseDescriptor.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/CASTests/desc/typePriorityTestCaseDescriptor.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/CASTests/desc/typePriorityTestCaseDescriptor.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/CASTests/english.txt b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/CASTests/english.txt similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/CASTests/english.txt rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/CASTests/english.txt
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/CASTests/verjuice.txt b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/CASTests/verjuice.txt similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/CASTests/verjuice.txt rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/CASTests/verjuice.txt
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/CASTests/xcas/sample.ts b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/CASTests/xcas/sample.ts similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/CASTests/xcas/sample.ts rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/CASTests/xcas/sample.ts
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/CASTests/xcas/sample1.xcas b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/CASTests/xcas/sample1.xcas similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/CASTests/xcas/sample1.xcas rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/CASTests/xcas/sample1.xcas
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/CASTests/xcas/sample2.xcas b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/CASTests/xcas/sample2.xcas similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/CASTests/xcas/sample2.xcas rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/CASTests/xcas/sample2.xcas
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/CasCreationUtilsTest/AggregateTaeWithImports.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/CasCreationUtilsTest/AggregateTaeWithImports.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/CasCreationUtilsTest/AggregateTaeWithImports.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/CasCreationUtilsTest/AggregateTaeWithImports.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/CasCreationUtilsTest/AggregateTaeWithSoapDelegate.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/CasCreationUtilsTest/AggregateTaeWithSoapDelegate.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/CasCreationUtilsTest/AggregateTaeWithSoapDelegate.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/CasCreationUtilsTest/AggregateTaeWithSoapDelegate.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/CasCreationUtilsTest/SoapAE.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/CasCreationUtilsTest/SoapAE.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/CasCreationUtilsTest/SoapAE.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/CasCreationUtilsTest/SoapAE.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/CasCreationUtilsTest/TaeWithImports.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/CasCreationUtilsTest/TaeWithImports.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/CasCreationUtilsTest/TaeWithImports.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/CasCreationUtilsTest/TaeWithImports.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/CasCreationUtilsTest/TypeSystem1.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/CasCreationUtilsTest/TypeSystem1.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/CasCreationUtilsTest/TypeSystem1.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/CasCreationUtilsTest/TypeSystem1.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/CasCreationUtilsTest/TypeSystem2.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/CasCreationUtilsTest/TypeSystem2.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/CasCreationUtilsTest/TypeSystem2.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/CasCreationUtilsTest/TypeSystem2.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/CasCreationUtilsTest/TypeSystemMergeBase.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/CasCreationUtilsTest/TypeSystemMergeBase.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/CasCreationUtilsTest/TypeSystemMergeBase.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/CasCreationUtilsTest/TypeSystemMergeBase.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/CasCreationUtilsTest/TypeSystemMergeNoElementType.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/CasCreationUtilsTest/TypeSystemMergeNoElementType.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/CasCreationUtilsTest/TypeSystemMergeNoElementType.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/CasCreationUtilsTest/TypeSystemMergeNoElementType.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/CasCreationUtilsTest/TypeSystemMergeOkMultiRef.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/CasCreationUtilsTest/TypeSystemMergeOkMultiRef.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/CasCreationUtilsTest/TypeSystemMergeOkMultiRef.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/CasCreationUtilsTest/TypeSystemMergeOkMultiRef.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/CasCreationUtilsTest/TypeSystemMergeWrongElementType1.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/CasCreationUtilsTest/TypeSystemMergeWrongElementType1.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/CasCreationUtilsTest/TypeSystemMergeWrongElementType1.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/CasCreationUtilsTest/TypeSystemMergeWrongElementType1.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/CasCreationUtilsTest/TypeSystemMergeWrongElementType2.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/CasCreationUtilsTest/TypeSystemMergeWrongElementType2.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/CasCreationUtilsTest/TypeSystemMergeWrongElementType2.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/CasCreationUtilsTest/TypeSystemMergeWrongElementType2.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/CasCreationUtilsTest/TypeSystemMergeWrongElementTypeWithNone.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/CasCreationUtilsTest/TypeSystemMergeWrongElementTypeWithNone.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/CasCreationUtilsTest/TypeSystemMergeWrongElementTypeWithNone.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/CasCreationUtilsTest/TypeSystemMergeWrongElementTypeWithNone.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/CasCreationUtilsTest/TypeSystemMergeWrongMultiRef1.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/CasCreationUtilsTest/TypeSystemMergeWrongMultiRef1.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/CasCreationUtilsTest/TypeSystemMergeWrongMultiRef1.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/CasCreationUtilsTest/TypeSystemMergeWrongMultiRef1.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/CasCreationUtilsTest/TypeSystemMergeWrongMultiRef2.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/CasCreationUtilsTest/TypeSystemMergeWrongMultiRef2.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/CasCreationUtilsTest/TypeSystemMergeWrongMultiRef2.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/CasCreationUtilsTest/TypeSystemMergeWrongMultiRef2.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/CasCreationUtilsTest/TypeSystemMergeWrongMultiRef3.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/CasCreationUtilsTest/TypeSystemMergeWrongMultiRef3.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/CasCreationUtilsTest/TypeSystemMergeWrongMultiRef3.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/CasCreationUtilsTest/TypeSystemMergeWrongMultiRef3.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/CasCreationUtilsTest/typeSystemMergeTopElementType.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/CasCreationUtilsTest/typeSystemMergeTopElementType.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/CasCreationUtilsTest/typeSystemMergeTopElementType.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/CasCreationUtilsTest/typeSystemMergeTopElementType.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/ClassLoaderTest/classLoadingTest.jar b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/ClassLoaderTest/classLoadingTest.jar similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/ClassLoaderTest/classLoadingTest.jar rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/ClassLoaderTest/classLoadingTest.jar Binary files differ
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/ConfigurableResourceImplTest/AnnotatorWithConfigurationGroups.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/ConfigurableResourceImplTest/AnnotatorWithConfigurationGroups.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/ConfigurableResourceImplTest/AnnotatorWithConfigurationGroups.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/ConfigurableResourceImplTest/AnnotatorWithConfigurationGroups.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/CpeSofaTest/SofaFlowController.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/CpeSofaTest/SofaFlowController.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/CpeSofaTest/SofaFlowController.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/CpeSofaTest/SofaFlowController.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/CpeSofaTest/TCasTransAnnotatorAggregate.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/CpeSofaTest/TCasTransAnnotatorAggregate.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/CpeSofaTest/TCasTransAnnotatorAggregate.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/CpeSofaTest/TCasTransAnnotatorAggregate.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/CpeSofaTest/TcasTransAnnotator.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/CpeSofaTest/TcasTransAnnotator.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/CpeSofaTest/TcasTransAnnotator.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/CpeSofaTest/TcasTransAnnotator.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/CpeSofaTest/TransAnnotator.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/CpeSofaTest/TransAnnotator.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/CpeSofaTest/TransAnnotator.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/CpeSofaTest/TransAnnotator.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/CpeSofaTest/TransAnnotatorAggregate.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/CpeSofaTest/TransAnnotatorAggregate.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/CpeSofaTest/TransAnnotatorAggregate.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/CpeSofaTest/TransAnnotatorAggregate.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/CpeSofaTest/TransAnnotatorAggregateWithoutSofaNameMapping.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/CpeSofaTest/TransAnnotatorAggregateWithoutSofaNameMapping.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/CpeSofaTest/TransAnnotatorAggregateWithoutSofaNameMapping.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/CpeSofaTest/TransAnnotatorAggregateWithoutSofaNameMapping.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/CpeSofaTest/TransAnnotatorAndTestAnnotatorAggregate.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/CpeSofaTest/TransAnnotatorAndTestAnnotatorAggregate.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/CpeSofaTest/TransAnnotatorAndTestAnnotatorAggregate.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/CpeSofaTest/TransAnnotatorAndTestAnnotatorAggregate.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/ExampleCas/cas.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/ExampleCas/cas.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/ExampleCas/cas.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/ExampleCas/cas.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/ExampleCas/multiSofaCas.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/ExampleCas/multiSofaCas.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/ExampleCas/multiSofaCas.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/ExampleCas/multiSofaCas.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/ExampleCas/newprimitives.xcas b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/ExampleCas/newprimitives.xcas similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/ExampleCas/newprimitives.xcas rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/ExampleCas/newprimitives.xcas
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/ExampleCas/partialTestTypeSystem.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/ExampleCas/partialTestTypeSystem.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/ExampleCas/partialTestTypeSystem.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/ExampleCas/partialTestTypeSystem.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/ExampleCas/simpleCas.xmi b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/ExampleCas/simpleCas.xmi similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/ExampleCas/simpleCas.xmi rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/ExampleCas/simpleCas.xmi
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/ExampleCas/testIndexes.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/ExampleCas/testIndexes.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/ExampleCas/testIndexes.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/ExampleCas/testIndexes.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/ExampleCas/testTypeSystem.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/ExampleCas/testTypeSystem.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/ExampleCas/testTypeSystem.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/ExampleCas/testTypeSystem.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/ExampleCas/testTypeSystem_withMultiRefs.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/ExampleCas/testTypeSystem_withMultiRefs.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/ExampleCas/testTypeSystem_withMultiRefs.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/ExampleCas/testTypeSystem_withMultiRefs.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/ExampleCas/v1MultiSofaCas.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/ExampleCas/v1MultiSofaCas.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/ExampleCas/v1MultiSofaCas.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/ExampleCas/v1MultiSofaCas.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/ExampleCas/v1cas.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/ExampleCas/v1cas.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/ExampleCas/v1cas.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/ExampleCas/v1cas.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/ExampleCas/v1xmiCas.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/ExampleCas/v1xmiCas.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/ExampleCas/v1xmiCas.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/ExampleCas/v1xmiCas.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/ExampleCas/xmiMsCasV1.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/ExampleCas/xmiMsCasV1.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/ExampleCas/xmiMsCasV1.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/ExampleCas/xmiMsCasV1.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/ExampleTae/NamesAndPersonTitles_TAE.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/ExampleTae/NamesAndPersonTitles_TAE.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/ExampleTae/NamesAndPersonTitles_TAE.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/ExampleTae/NamesAndPersonTitles_TAE.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/ExampleTae/PersonTitleAnnotator_WithinNamesOnly.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/ExampleTae/PersonTitleAnnotator_WithinNamesOnly.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/ExampleTae/PersonTitleAnnotator_WithinNamesOnly.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/ExampleTae/PersonTitleAnnotator_WithinNamesOnly.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/ExampleTae/SimpleNameRecognizer_RegEx_TAE.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/ExampleTae/SimpleNameRecognizer_RegEx_TAE.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/ExampleTae/SimpleNameRecognizer_RegEx_TAE.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/ExampleTae/SimpleNameRecognizer_RegEx_TAE.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/ExampleTae/arrayTypeSerialization.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/ExampleTae/arrayTypeSerialization.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/ExampleTae/arrayTypeSerialization.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/ExampleTae/arrayTypeSerialization.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/FsIndexCollectionImplTest/Circular1.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/FsIndexCollectionImplTest/Circular1.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/FsIndexCollectionImplTest/Circular1.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/FsIndexCollectionImplTest/Circular1.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/FsIndexCollectionImplTest/Circular2.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/FsIndexCollectionImplTest/Circular2.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/FsIndexCollectionImplTest/Circular2.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/FsIndexCollectionImplTest/Circular2.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/FsIndexCollectionImplTest/FsIndexCollectionImportedByLocation.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/FsIndexCollectionImplTest/FsIndexCollectionImportedByLocation.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/FsIndexCollectionImplTest/FsIndexCollectionImportedByLocation.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/FsIndexCollectionImplTest/FsIndexCollectionImportedByLocation.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/FsIndexCollectionImplTest/TestFsIndexCollection.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/FsIndexCollectionImplTest/TestFsIndexCollection.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/FsIndexCollectionImplTest/TestFsIndexCollection.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/FsIndexCollectionImplTest/TestFsIndexCollection.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/FsIndexCollectionImplTest/dataPathDir/FsIndexCollectionImportedFromDataPath.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/FsIndexCollectionImplTest/dataPathDir/FsIndexCollectionImportedFromDataPath.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/FsIndexCollectionImplTest/dataPathDir/FsIndexCollectionImportedFromDataPath.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/FsIndexCollectionImplTest/dataPathDir/FsIndexCollectionImportedFromDataPath.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/ImportImplTest/TS.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/ImportImplTest/TS.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/ImportImplTest/TS.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/ImportImplTest/TS.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/ImportImplTest/subdir/PrimitiveTaeForNestedImportTest.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/ImportImplTest/subdir/PrimitiveTaeForNestedImportTest.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/ImportImplTest/subdir/PrimitiveTaeForNestedImportTest.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/ImportImplTest/subdir/PrimitiveTaeForNestedImportTest.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/ImportImplTest/subdir/subdir2/AggregateTaeForNestedImportTest.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/ImportImplTest/subdir/subdir2/AggregateTaeForNestedImportTest.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/ImportImplTest/subdir/subdir2/AggregateTaeForNestedImportTest.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/ImportImplTest/subdir/subdir2/AggregateTaeForNestedImportTest.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/IndexBuildSpecificationImplTest/TestIndexBuildSpec.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/IndexBuildSpecificationImplTest/TestIndexBuildSpec.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/IndexBuildSpecificationImplTest/TestIndexBuildSpec.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/IndexBuildSpecificationImplTest/TestIndexBuildSpec.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/ResourceManagerConfigurationImplTest/ResourceManagerConfigurationWithImports.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/ResourceManagerConfigurationImplTest/ResourceManagerConfigurationWithImports.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/ResourceManagerConfigurationImplTest/ResourceManagerConfigurationWithImports.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/ResourceManagerConfigurationImplTest/ResourceManagerConfigurationWithImports.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/ResourceManagerConfigurationImplTest/TaeImportingResourceManagerConfiguration.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/ResourceManagerConfigurationImplTest/TaeImportingResourceManagerConfiguration.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/ResourceManagerConfigurationImplTest/TaeImportingResourceManagerConfiguration.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/ResourceManagerConfigurationImplTest/TaeImportingResourceManagerConfiguration.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/ResourceManagerConfigurationImplTest/TaeImportingResourceManagerConfigurationOldStyle.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/ResourceManagerConfigurationImplTest/TaeImportingResourceManagerConfigurationOldStyle.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/ResourceManagerConfigurationImplTest/TaeImportingResourceManagerConfigurationOldStyle.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/ResourceManagerConfigurationImplTest/TaeImportingResourceManagerConfigurationOldStyle.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/ResourceManagerConfigurationImplTest/TestResourceManagerConfiguration.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/ResourceManagerConfigurationImplTest/TestResourceManagerConfiguration.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/ResourceManagerConfigurationImplTest/TestResourceManagerConfiguration.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/ResourceManagerConfigurationImplTest/TestResourceManagerConfiguration.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/ResourceManagerImplTest/ResourceTestAggregate.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/ResourceManagerImplTest/ResourceTestAggregate.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/ResourceManagerImplTest/ResourceTestAggregate.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/ResourceManagerImplTest/ResourceTestAggregate.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/ResourceManagerImplTest/ResourceTestAnnotator.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/ResourceManagerImplTest/ResourceTestAnnotator.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/ResourceManagerImplTest/ResourceTestAnnotator.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/ResourceManagerImplTest/ResourceTestAnnotator.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/ResourceManagerImplTest/ResourceTestAnnotator2.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/ResourceManagerImplTest/ResourceTestAnnotator2.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/ResourceManagerImplTest/ResourceTestAnnotator2.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/ResourceManagerImplTest/ResourceTestAnnotator2.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/ResourceTest/DataResource_implTest_tempDataFile.dat b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/ResourceTest/DataResource_implTest_tempDataFile.dat similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/ResourceTest/DataResource_implTest_tempDataFile.dat rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/ResourceTest/DataResource_implTest_tempDataFile.dat
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/ResourceTest/FileLanguageResource_implTest_data_de.dat b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/ResourceTest/FileLanguageResource_implTest_data_de.dat similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/ResourceTest/FileLanguageResource_implTest_data_de.dat rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/ResourceTest/FileLanguageResource_implTest_data_de.dat
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/ResourceTest/FileLanguageResource_implTest_data_en.dat b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/ResourceTest/FileLanguageResource_implTest_data_en.dat similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/ResourceTest/FileLanguageResource_implTest_data_en.dat rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/ResourceTest/FileLanguageResource_implTest_data_en.dat
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/ResourceTest/ResourceManager_implTest_tempDataFile.dat b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/ResourceTest/ResourceManager_implTest_tempDataFile.dat similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/ResourceTest/ResourceManager_implTest_tempDataFile.dat rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/ResourceTest/ResourceManager_implTest_tempDataFile.dat
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/ResourceTest/spaces in dir name/Test.dat b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/ResourceTest/spaces in dir name/Test.dat similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/ResourceTest/spaces in dir name/Test.dat rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/ResourceTest/spaces in dir name/Test.dat
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/ResourceTest/subdir/test/relativePathTest.dat b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/ResourceTest/subdir/test/relativePathTest.dat similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/ResourceTest/subdir/test/relativePathTest.dat rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/ResourceTest/subdir/test/relativePathTest.dat
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/SequencerTest/Annotator1.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/SequencerTest/Annotator1.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/SequencerTest/Annotator1.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/SequencerTest/Annotator1.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/SequencerTest/Annotator2.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/SequencerTest/Annotator2.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/SequencerTest/Annotator2.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/SequencerTest/Annotator2.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/SequencerTest/Annotator3.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/SequencerTest/Annotator3.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/SequencerTest/Annotator3.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/SequencerTest/Annotator3.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/SequencerTest/FrostImitation.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/SequencerTest/FrostImitation.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/SequencerTest/FrostImitation.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/SequencerTest/FrostImitation.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/SequencerTest/FrostImitationTypeSystem.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/SequencerTest/FrostImitationTypeSystem.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/SequencerTest/FrostImitationTypeSystem.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/SequencerTest/FrostImitationTypeSystem.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/SequencerTest/SequencerCapabilityLanguageAggregate.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/SequencerTest/SequencerCapabilityLanguageAggregate.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/SequencerTest/SequencerCapabilityLanguageAggregate.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/SequencerTest/SequencerCapabilityLanguageAggregate.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/SequencerTest/SequencerCapabilityLanguageAggregateES.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/SequencerTest/SequencerCapabilityLanguageAggregateES.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/SequencerTest/SequencerCapabilityLanguageAggregateES.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/SequencerTest/SequencerCapabilityLanguageAggregateES.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/SequencerTest/SequencerCapabilityLanguageAggregateResultSpec.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/SequencerTest/SequencerCapabilityLanguageAggregateResultSpec.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/SequencerTest/SequencerCapabilityLanguageAggregateResultSpec.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/SequencerTest/SequencerCapabilityLanguageAggregateResultSpec.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/SequencerTest/SequencerCapabilityLanguageExpectedEn.txt b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/SequencerTest/SequencerCapabilityLanguageExpectedEn.txt similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/SequencerTest/SequencerCapabilityLanguageExpectedEn.txt rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/SequencerTest/SequencerCapabilityLanguageExpectedEn.txt
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/SequencerTest/SequencerCapabilityLanguageExpectedEnResultSpec.txt b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/SequencerTest/SequencerCapabilityLanguageExpectedEnResultSpec.txt similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/SequencerTest/SequencerCapabilityLanguageExpectedEnResultSpec.txt rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/SequencerTest/SequencerCapabilityLanguageExpectedEnResultSpec.txt
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/SequencerTest/SequencerCapabilityLanguageExpectedEsAr.txt b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/SequencerTest/SequencerCapabilityLanguageExpectedEsAr.txt similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/SequencerTest/SequencerCapabilityLanguageExpectedEsAr.txt rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/SequencerTest/SequencerCapabilityLanguageExpectedEsAr.txt
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/SequencerTest/SequencerCapabilityLanguageExpectedEsEn.txt b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/SequencerTest/SequencerCapabilityLanguageExpectedEsEn.txt similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/SequencerTest/SequencerCapabilityLanguageExpectedEsEn.txt rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/SequencerTest/SequencerCapabilityLanguageExpectedEsEn.txt
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/SequencerTest/SequencerCapabilityLanguageExpectedEsEnResultSpec.txt b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/SequencerTest/SequencerCapabilityLanguageExpectedEsEnResultSpec.txt similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/SequencerTest/SequencerCapabilityLanguageExpectedEsEnResultSpec.txt rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/SequencerTest/SequencerCapabilityLanguageExpectedEsEnResultSpec.txt
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/SequencerTest/SequencerCapabilityLanguageExpectedEsEnUS.txt b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/SequencerTest/SequencerCapabilityLanguageExpectedEsEnUS.txt similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/SequencerTest/SequencerCapabilityLanguageExpectedEsEnUS.txt rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/SequencerTest/SequencerCapabilityLanguageExpectedEsEnUS.txt
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/SequencerTest/SequencerCapabilityLanguageExpectedEsUnknown.txt b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/SequencerTest/SequencerCapabilityLanguageExpectedEsUnknown.txt similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/SequencerTest/SequencerCapabilityLanguageExpectedEsUnknown.txt rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/SequencerTest/SequencerCapabilityLanguageExpectedEsUnknown.txt
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/SequencerTest/SequencerCapabilityLanguageExpectedEsZhCN.txt b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/SequencerTest/SequencerCapabilityLanguageExpectedEsZhCN.txt similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/SequencerTest/SequencerCapabilityLanguageExpectedEsZhCN.txt rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/SequencerTest/SequencerCapabilityLanguageExpectedEsZhCN.txt
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/SequencerTest/SequencerCapabilityLanguageExpectedEsZhCNResultSpec.txt b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/SequencerTest/SequencerCapabilityLanguageExpectedEsZhCNResultSpec.txt similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/SequencerTest/SequencerCapabilityLanguageExpectedEsZhCNResultSpec.txt rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/SequencerTest/SequencerCapabilityLanguageExpectedEsZhCNResultSpec.txt
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/SequencerTest/SequencerCapabilityLanguageExpectedJa.txt b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/SequencerTest/SequencerCapabilityLanguageExpectedJa.txt similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/SequencerTest/SequencerCapabilityLanguageExpectedJa.txt rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/SequencerTest/SequencerCapabilityLanguageExpectedJa.txt
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/SequencerTest/SequencerCapabilityLanguageExpectedJaResultSpec.txt b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/SequencerTest/SequencerCapabilityLanguageExpectedJaResultSpec.txt similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/SequencerTest/SequencerCapabilityLanguageExpectedJaResultSpec.txt rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/SequencerTest/SequencerCapabilityLanguageExpectedJaResultSpec.txt
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/SequencerTest/SequencerCapabilityLanguageExpectedResultSpecSetByFlowController.txt b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/SequencerTest/SequencerCapabilityLanguageExpectedResultSpecSetByFlowController.txt similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/SequencerTest/SequencerCapabilityLanguageExpectedResultSpecSetByFlowController.txt rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/SequencerTest/SequencerCapabilityLanguageExpectedResultSpecSetByFlowController.txt
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/SequencerTest/SequencerCapabilityLanguageExpectedXunSpec.txt b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/SequencerTest/SequencerCapabilityLanguageExpectedXunSpec.txt similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/SequencerTest/SequencerCapabilityLanguageExpectedXunSpec.txt rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/SequencerTest/SequencerCapabilityLanguageExpectedXunSpec.txt
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/SequencerTest/SequencerFixedAggregate.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/SequencerTest/SequencerFixedAggregate.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/SequencerTest/SequencerFixedAggregate.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/SequencerTest/SequencerFixedAggregate.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/SequencerTest/SequencerFixedExpected.txt b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/SequencerTest/SequencerFixedExpected.txt similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/SequencerTest/SequencerFixedExpected.txt rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/SequencerTest/SequencerFixedExpected.txt
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/SequencerTest/TokenLemmaAnnotator.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/SequencerTest/TokenLemmaAnnotator.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/SequencerTest/TokenLemmaAnnotator.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/SequencerTest/TokenLemmaAnnotator.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/SequencerTest/WhitespaceTokenizer.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/SequencerTest/WhitespaceTokenizer.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/SequencerTest/WhitespaceTokenizer.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/SequencerTest/WhitespaceTokenizer.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AeWithConfigParamOverridesAndImportByName.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AeWithConfigParamOverridesAndImportByName.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AeWithConfigParamOverridesAndImportByName.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AeWithConfigParamOverridesAndImportByName.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AggregateContainingAggregateSegmenter.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AggregateContainingAggregateSegmenter.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AggregateContainingAggregateSegmenter.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AggregateContainingAggregateSegmenter.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AggregateForCollectionProcessCompleteTest.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AggregateForCollectionProcessCompleteTest.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AggregateForCollectionProcessCompleteTest.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AggregateForCollectionProcessCompleteTest.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AggregateForErrorTest.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AggregateForErrorTest.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AggregateForErrorTest.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AggregateForErrorTest.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AggregateForParallelStepCasMultiplierTest.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AggregateForParallelStepCasMultiplierTest.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AggregateForParallelStepCasMultiplierTest.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AggregateForParallelStepCasMultiplierTest.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AggregateForParallelStepTest.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AggregateForParallelStepTest.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AggregateForParallelStepTest.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AggregateForParallelStepTest.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AggregateSegmenterForDropTest.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AggregateSegmenterForDropTest.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AggregateSegmenterForDropTest.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AggregateSegmenterForDropTest.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AggregateTaeForMergeTest.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AggregateTaeForMergeTest.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AggregateTaeForMergeTest.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AggregateTaeForMergeTest.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AggregateTaeWithCasConsumer.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AggregateTaeWithCasConsumer.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AggregateTaeWithCasConsumer.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AggregateTaeWithCasConsumer.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AggregateTaeWithConfigParamOverrides.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AggregateTaeWithConfigParamOverrides.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AggregateTaeWithConfigParamOverrides.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AggregateTaeWithConfigParamOverrides.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AggregateTaeWithConfigParamOverrides2.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AggregateTaeWithConfigParamOverrides2.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AggregateTaeWithConfigParamOverrides2.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AggregateTaeWithConfigParamOverrides2.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AggregateThatImportsItself.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AggregateThatImportsItself.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AggregateThatImportsItself.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AggregateThatImportsItself.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AggregateWith2Segmenters.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AggregateWith2Segmenters.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AggregateWith2Segmenters.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AggregateWith2Segmenters.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AggregateWith2SegmentersForErrorTest.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AggregateWith2SegmentersForErrorTest.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AggregateWith2SegmentersForErrorTest.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AggregateWith2SegmentersForErrorTest.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AggregateWithBadSegmenterForErrorTest.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AggregateWithBadSegmenterForErrorTest.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AggregateWithBadSegmenterForErrorTest.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AggregateWithBadSegmenterForErrorTest.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AggregateWithDuplicateGroupOverrides.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AggregateWithDuplicateGroupOverrides.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AggregateWithDuplicateGroupOverrides.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AggregateWithDuplicateGroupOverrides.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AggregateWithSegmenter.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AggregateWithSegmenter.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AggregateWithSegmenter.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AggregateWithSegmenter.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AggregateWithSegmenterForErrorTest.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AggregateWithSegmenterForErrorTest.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AggregateWithSegmenterForErrorTest.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AggregateWithSegmenterForErrorTest.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AggregateWithUnknownRemoteComponent.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AggregateWithUnknownRemoteComponent.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AggregateWithUnknownRemoteComponent.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AggregateWithUnknownRemoteComponent.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AnnotatorForCollectionProcessCompleteTest.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AnnotatorForCollectionProcessCompleteTest.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AnnotatorForCollectionProcessCompleteTest.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AnnotatorForCollectionProcessCompleteTest.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AnnotatorWithConfigurationGroups.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AnnotatorWithConfigurationGroups.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AnnotatorWithConfigurationGroups.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AnnotatorWithConfigurationGroups.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AnnotatorWithConfigurationParameters.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AnnotatorWithConfigurationParameters.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AnnotatorWithConfigurationParameters.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AnnotatorWithConfigurationParameters.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AnnotatorWithDuplicateConfigurationGroups.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AnnotatorWithDuplicateConfigurationGroups.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AnnotatorWithDuplicateConfigurationGroups.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AnnotatorWithDuplicateConfigurationGroups.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/BadSegmenter.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/BadSegmenter.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/BadSegmenter.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/BadSegmenter.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/EmptyAggregate.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/EmptyAggregate.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/EmptyAggregate.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/EmptyAggregate.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/ErrorAnnotator.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/ErrorAnnotator.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/ErrorAnnotator.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/ErrorAnnotator.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/FlowControllerForErrorTest.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/FlowControllerForErrorTest.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/FlowControllerForErrorTest.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/FlowControllerForErrorTest.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/FlowControllerForMergeTest.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/FlowControllerForMergeTest.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/FlowControllerForMergeTest.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/FlowControllerForMergeTest.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/FlowControllerWithConfigurationGroups.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/FlowControllerWithConfigurationGroups.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/FlowControllerWithConfigurationGroups.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/FlowControllerWithConfigurationGroups.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/FlowControllerWithConfigurationParameters.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/FlowControllerWithConfigurationParameters.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/FlowControllerWithConfigurationParameters.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/FlowControllerWithConfigurationParameters.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/InvalidAggregateSegmenter.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/InvalidAggregateSegmenter.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/InvalidAggregateSegmenter.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/InvalidAggregateSegmenter.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/InvalidAggregate_UndefinedKeyInFlow.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/InvalidAggregate_UndefinedKeyInFlow.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/InvalidAggregate_UndefinedKeyInFlow.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/InvalidAggregate_UndefinedKeyInFlow.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/InvalidConfigParams1.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/InvalidConfigParams1.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/InvalidConfigParams1.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/InvalidConfigParams1.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/InvalidConfigParams10.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/InvalidConfigParams10.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/InvalidConfigParams10.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/InvalidConfigParams10.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/InvalidConfigParams11.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/InvalidConfigParams11.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/InvalidConfigParams11.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/InvalidConfigParams11.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/InvalidConfigParams12.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/InvalidConfigParams12.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/InvalidConfigParams12.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/InvalidConfigParams12.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/InvalidConfigParams13.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/InvalidConfigParams13.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/InvalidConfigParams13.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/InvalidConfigParams13.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/InvalidConfigParams2.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/InvalidConfigParams2.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/InvalidConfigParams2.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/InvalidConfigParams2.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/InvalidConfigParams3.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/InvalidConfigParams3.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/InvalidConfigParams3.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/InvalidConfigParams3.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/InvalidConfigParams4.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/InvalidConfigParams4.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/InvalidConfigParams4.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/InvalidConfigParams4.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/InvalidConfigParams5.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/InvalidConfigParams5.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/InvalidConfigParams5.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/InvalidConfigParams5.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/InvalidConfigParams6.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/InvalidConfigParams6.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/InvalidConfigParams6.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/InvalidConfigParams6.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/InvalidConfigParams7.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/InvalidConfigParams7.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/InvalidConfigParams7.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/InvalidConfigParams7.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/InvalidConfigParams8.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/InvalidConfigParams8.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/InvalidConfigParams8.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/InvalidConfigParams8.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/InvalidConfigParams9.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/InvalidConfigParams9.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/InvalidConfigParams9.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/InvalidConfigParams9.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/InvalidFsIndexes.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/InvalidFsIndexes.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/InvalidFsIndexes.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/InvalidFsIndexes.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/NestedAggregateSegmenterForErrorTest.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/NestedAggregateSegmenterForErrorTest.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/NestedAggregateSegmenterForErrorTest.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/NestedAggregateSegmenterForErrorTest.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/NewlineResegmenter.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/NewlineResegmenter.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/NewlineResegmenter.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/NewlineResegmenter.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/NewlineSegmenter.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/NewlineSegmenter.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/NewlineSegmenter.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/NewlineSegmenter.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/ParallelFlowController.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/ParallelFlowController.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/ParallelFlowController.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/ParallelFlowController.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/SegmentDroppingFlowController.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/SegmentDroppingFlowController.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/SegmentDroppingFlowController.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/SegmentDroppingFlowController.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/TabSegmenter.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/TabSegmenter.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/TabSegmenter.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/TabSegmenter.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/TestAggregateContainingCppAnnotator.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/TestAggregateContainingCppAnnotator.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/TestAggregateContainingCppAnnotator.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/TestAggregateContainingCppAnnotator.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/TestCasConsumer.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/TestCasConsumer.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/TestCasConsumer.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/TestCasConsumer.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/TestPrimitiveTae1.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/TestPrimitiveTae1.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/TestPrimitiveTae1.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/TestPrimitiveTae1.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/TestPrimitiveTae2.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/TestPrimitiveTae2.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/TestPrimitiveTae2.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/TestPrimitiveTae2.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/TestUimaCppAe.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/TestUimaCppAe.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/TestUimaCppAe.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/TestUimaCppAe.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/UnsatisfiedResourceDependency.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/UnsatisfiedResourceDependency.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/UnsatisfiedResourceDependency.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/UnsatisfiedResourceDependency.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/dataPathDir/AnnotatorWithConfigurationParameters.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/dataPathDir/AnnotatorWithConfigurationParameters.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/dataPathDir/AnnotatorWithConfigurationParameters.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/dataPathDir/AnnotatorWithConfigurationParameters.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/TypePrioritiesImplTest/Circular1.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TypePrioritiesImplTest/Circular1.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/TypePrioritiesImplTest/Circular1.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TypePrioritiesImplTest/Circular1.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/TypePrioritiesImplTest/Circular2.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TypePrioritiesImplTest/Circular2.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/TypePrioritiesImplTest/Circular2.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TypePrioritiesImplTest/Circular2.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/TypePrioritiesImplTest/SimpleTypePriorities.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TypePrioritiesImplTest/SimpleTypePriorities.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/TypePrioritiesImplTest/SimpleTypePriorities.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TypePrioritiesImplTest/SimpleTypePriorities.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/TypePrioritiesImplTest/TestTypePriorities.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TypePrioritiesImplTest/TestTypePriorities.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/TypePrioritiesImplTest/TestTypePriorities.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TypePrioritiesImplTest/TestTypePriorities.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/TypePrioritiesImplTest/TypePrioritiesImportedByLocation.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TypePrioritiesImplTest/TypePrioritiesImportedByLocation.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/TypePrioritiesImplTest/TypePrioritiesImportedByLocation.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TypePrioritiesImplTest/TypePrioritiesImportedByLocation.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/TypePrioritiesImplTest/dataPathDir/TypePrioritiesImportedFromDataPath.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TypePrioritiesImplTest/dataPathDir/TypePrioritiesImportedFromDataPath.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/TypePrioritiesImplTest/dataPathDir/TypePrioritiesImportedFromDataPath.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TypePrioritiesImplTest/dataPathDir/TypePrioritiesImportedFromDataPath.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/TypeSystemDescriptionImplTest/Circular1.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TypeSystemDescriptionImplTest/Circular1.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/TypeSystemDescriptionImplTest/Circular1.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TypeSystemDescriptionImplTest/Circular1.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/TypeSystemDescriptionImplTest/Circular2.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TypeSystemDescriptionImplTest/Circular2.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/TypeSystemDescriptionImplTest/Circular2.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TypeSystemDescriptionImplTest/Circular2.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/TypeSystemDescriptionImplTest/InvalidTypeSystem1.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TypeSystemDescriptionImplTest/InvalidTypeSystem1.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/TypeSystemDescriptionImplTest/InvalidTypeSystem1.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TypeSystemDescriptionImplTest/InvalidTypeSystem1.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/TypeSystemDescriptionImplTest/TaeImportingTypeSystem.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TypeSystemDescriptionImplTest/TaeImportingTypeSystem.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/TypeSystemDescriptionImplTest/TaeImportingTypeSystem.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TypeSystemDescriptionImplTest/TaeImportingTypeSystem.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/TypeSystemDescriptionImplTest/TestTypeSystem.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TypeSystemDescriptionImplTest/TestTypeSystem.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/TypeSystemDescriptionImplTest/TestTypeSystem.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TypeSystemDescriptionImplTest/TestTypeSystem.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/TypeSystemDescriptionImplTest/TypeSystemImportedByLocation.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TypeSystemDescriptionImplTest/TypeSystemImportedByLocation.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/TypeSystemDescriptionImplTest/TypeSystemImportedByLocation.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TypeSystemDescriptionImplTest/TypeSystemImportedByLocation.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/TypeSystemDescriptionImplTest/dataPathDir/TypeSystemImportedFromDataPath.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TypeSystemDescriptionImplTest/dataPathDir/TypeSystemImportedFromDataPath.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/TypeSystemDescriptionImplTest/dataPathDir/TypeSystemImportedFromDataPath.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/TypeSystemDescriptionImplTest/dataPathDir/TypeSystemImportedFromDataPath.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/UimaContextTest/CasConsumerForUimaContextTest.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/UimaContextTest/CasConsumerForUimaContextTest.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/UimaContextTest/CasConsumerForUimaContextTest.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/UimaContextTest/CasConsumerForUimaContextTest.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/XmlParserTest/EnvVarRefTest.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/XmlParserTest/EnvVarRefTest.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/XmlParserTest/EnvVarRefTest.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/XmlParserTest/EnvVarRefTest.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/XmlParserTest/ExampleTypeSystem.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/XmlParserTest/ExampleTypeSystem.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/XmlParserTest/ExampleTypeSystem.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/XmlParserTest/ExampleTypeSystem.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/XmlParserTest/JTalentAndStringMatch.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/XmlParserTest/JTalentAndStringMatch.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/XmlParserTest/JTalentAndStringMatch.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/XmlParserTest/JTalentAndStringMatch.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/XmlParserTest/JTalentAndStringMatch_Expanded.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/XmlParserTest/JTalentAndStringMatch_Expanded.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/XmlParserTest/JTalentAndStringMatch_Expanded.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/XmlParserTest/JTalentAndStringMatch_Expanded.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/XmlParserTest/JTalentAnnotator_Enhanced.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/XmlParserTest/JTalentAnnotator_Enhanced.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/XmlParserTest/JTalentAnnotator_Enhanced.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/XmlParserTest/JTalentAnnotator_Enhanced.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/XmlParserTest/NotConformingToSchema.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/XmlParserTest/NotConformingToSchema.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/XmlParserTest/NotConformingToSchema.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/XmlParserTest/NotConformingToSchema.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/XmlParserTest/StringMatchAnnotator2.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/XmlParserTest/StringMatchAnnotator2.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/XmlParserTest/StringMatchAnnotator2.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/XmlParserTest/StringMatchAnnotator2.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/XmlParserTest/TestCustomResourceSpecifier.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/XmlParserTest/TestCustomResourceSpecifier.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/XmlParserTest/TestCustomResourceSpecifier.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/XmlParserTest/TestCustomResourceSpecifier.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/XmlParserTest/TestPearSpecifier.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/XmlParserTest/TestPearSpecifier.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/XmlParserTest/TestPearSpecifier.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/XmlParserTest/TestPearSpecifier.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/XmlParserTest/TestUriSpecifier.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/XmlParserTest/TestUriSpecifier.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/XmlParserTest/TestUriSpecifier.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/XmlParserTest/TestUriSpecifier.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/XmlParserTest/XIncludeXPointerTest.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/XmlParserTest/XIncludeXPointerTest.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/XmlParserTest/XIncludeXPointerTest.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/XmlParserTest/XIncludeXPointerTest.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/XmlParserTest/XIncludeXPointerTest_Expanded.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/XmlParserTest/XIncludeXPointerTest_Expanded.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/XmlParserTest/XIncludeXPointerTest_Expanded.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/XmlParserTest/XIncludeXPointerTest_Expanded.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/data/moby.txt b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/data/moby.txt similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/data/moby.txt rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/data/moby.txt
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/org/apache/uima/analysis_engine/impl/testDataFile3.dat b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/org/apache/uima/analysis_engine/impl/testDataFile3.dat similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/org/apache/uima/analysis_engine/impl/testDataFile3.dat rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/org/apache/uima/analysis_engine/impl/testDataFile3.dat
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/org/apache/uima/cas_data/impl/xcastest.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/org/apache/uima/cas_data/impl/xcastest.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/org/apache/uima/cas_data/impl/xcastest.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/org/apache/uima/cas_data/impl/xcastest.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/org/apache/uima/resource/impl/ResourceInClasspath.txt b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/org/apache/uima/resource/impl/ResourceInClasspath.txt similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/org/apache/uima/resource/impl/ResourceInClasspath.txt rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/org/apache/uima/resource/impl/ResourceInClasspath.txt
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/org/apache/uima/resource/metadata/impl/ConfigParamEmptyGroup.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/org/apache/uima/resource/metadata/impl/ConfigParamEmptyGroup.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/org/apache/uima/resource/metadata/impl/ConfigParamEmptyGroup.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/org/apache/uima/resource/metadata/impl/ConfigParamEmptyGroup.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/org/apache/uima/resource/metadata/impl/TypeSystemImportedByName.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/org/apache/uima/resource/metadata/impl/TypeSystemImportedByName.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/org/apache/uima/resource/metadata/impl/TypeSystemImportedByName.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/org/apache/uima/resource/metadata/impl/TypeSystemImportedByName.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/org/apache/uima/util/impl/logger_test_messages.properties b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/org/apache/uima/util/impl/logger_test_messages.properties similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/org/apache/uima/util/impl/logger_test_messages.properties rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/org/apache/uima/util/impl/logger_test_messages.properties
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/pearTests/DateTime.pear b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/pearTests/DateTime.pear similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/pearTests/DateTime.pear rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/pearTests/DateTime.pear Binary files differ
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/pearTests/RoomNumber.pear b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/pearTests/RoomNumber.pear similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/pearTests/RoomNumber.pear rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/pearTests/RoomNumber.pear Binary files differ
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/pearTests/analysisEngine.pear b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/pearTests/analysisEngine.pear similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/pearTests/analysisEngine.pear rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/pearTests/analysisEngine.pear Binary files differ
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/pearTests/analysisEngine2.pear b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/pearTests/analysisEngine2.pear similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/pearTests/analysisEngine2.pear rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/pearTests/analysisEngine2.pear Binary files differ
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/pearTests/casConsumer.pear b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/pearTests/casConsumer.pear similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/pearTests/casConsumer.pear rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/pearTests/casConsumer.pear Binary files differ
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/pearTests/componentCategoryTests/ae.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/pearTests/componentCategoryTests/ae.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/pearTests/componentCategoryTests/ae.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/pearTests/componentCategoryTests/ae.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/pearTests/componentCategoryTests/cc.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/pearTests/componentCategoryTests/cc.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/pearTests/componentCategoryTests/cc.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/pearTests/componentCategoryTests/cc.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/pearTests/componentCategoryTests/ci.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/pearTests/componentCategoryTests/ci.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/pearTests/componentCategoryTests/ci.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/pearTests/componentCategoryTests/ci.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/pearTests/componentCategoryTests/cr.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/pearTests/componentCategoryTests/cr.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/pearTests/componentCategoryTests/cr.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/pearTests/componentCategoryTests/cr.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/pearTests/componentCategoryTests/ts.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/pearTests/componentCategoryTests/ts.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/pearTests/componentCategoryTests/ts.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/pearTests/componentCategoryTests/ts.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/pearTests/encodingTests/UTF16_no_signature.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/pearTests/encodingTests/UTF16_no_signature.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/pearTests/encodingTests/UTF16_no_signature.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/pearTests/encodingTests/UTF16_no_signature.xml Binary files differ
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/pearTests/encodingTests/UTF16_with_signature.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/pearTests/encodingTests/UTF16_with_signature.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/pearTests/encodingTests/UTF16_with_signature.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/pearTests/encodingTests/UTF16_with_signature.xml Binary files differ
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/pearTests/encodingTests/UTF8_no_signature.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/pearTests/encodingTests/UTF8_no_signature.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/pearTests/encodingTests/UTF8_no_signature.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/pearTests/encodingTests/UTF8_no_signature.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/pearTests/encodingTests/UTF8_with_signature.xml b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/pearTests/encodingTests/UTF8_with_signature.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/pearTests/encodingTests/UTF8_with_signature.xml rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/pearTests/encodingTests/UTF8_with_signature.xml
diff --git a/uimaj-2.2.1-06/uimaj-core/src/test/resources/pearTests/typeSystem.pear b/uimaj-2.2.1-incubating/uimaj-core/src/test/resources/pearTests/typeSystem.pear similarity index 100% rename from uimaj-2.2.1-06/uimaj-core/src/test/resources/pearTests/typeSystem.pear rename to uimaj-2.2.1-incubating/uimaj-core/src/test/resources/pearTests/typeSystem.pear Binary files differ
diff --git a/uimaj-2.2.1-06/uimaj-cpe/pom.xml b/uimaj-2.2.1-incubating/uimaj-cpe/pom.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/pom.xml rename to uimaj-2.2.1-incubating/uimaj-cpe/pom.xml
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/cas_data/impl/vinci/VinciCasDataConverter.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/cas_data/impl/vinci/VinciCasDataConverter.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/cas_data/impl/vinci/VinciCasDataConverter.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/cas_data/impl/vinci/VinciCasDataConverter.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/CasConverter.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/CasConverter.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/CasConverter.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/CasConverter.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/CollectionProcessingEngine_impl.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/CollectionProcessingEngine_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/CollectionProcessingEngine_impl.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/CollectionProcessingEngine_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/EntityProcessStatusImpl.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/EntityProcessStatusImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/EntityProcessStatusImpl.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/EntityProcessStatusImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/base_cpm/container/CasProcessorConfiguration.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/base_cpm/container/CasProcessorConfiguration.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/base_cpm/container/CasProcessorConfiguration.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/base_cpm/container/CasProcessorConfiguration.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/base_cpm/container/CasProcessorController.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/base_cpm/container/CasProcessorController.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/base_cpm/container/CasProcessorController.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/base_cpm/container/CasProcessorController.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/base_cpm/container/KillPipelineException.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/base_cpm/container/KillPipelineException.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/base_cpm/container/KillPipelineException.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/base_cpm/container/KillPipelineException.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/base_cpm/container/ProcessingContainer.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/base_cpm/container/ProcessingContainer.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/base_cpm/container/ProcessingContainer.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/base_cpm/container/ProcessingContainer.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/base_cpm/container/RunnableContainer.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/base_cpm/container/RunnableContainer.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/base_cpm/container/RunnableContainer.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/base_cpm/container/RunnableContainer.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/base_cpm/container/ServiceConnectionException.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/base_cpm/container/ServiceConnectionException.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/base_cpm/container/ServiceConnectionException.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/base_cpm/container/ServiceConnectionException.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/base_cpm/container/deployer/CPEDeployer.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/base_cpm/container/deployer/CPEDeployer.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/base_cpm/container/deployer/CPEDeployer.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/base_cpm/container/deployer/CPEDeployer.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/base_cpm/container/deployer/CasProcessorDeployer.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/base_cpm/container/deployer/CasProcessorDeployer.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/base_cpm/container/deployer/CasProcessorDeployer.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/base_cpm/container/deployer/CasProcessorDeployer.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/base_cpm/container/deployer/CasProcessorDeploymentException.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/base_cpm/container/deployer/CasProcessorDeploymentException.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/base_cpm/container/deployer/CasProcessorDeploymentException.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/base_cpm/container/deployer/CasProcessorDeploymentException.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/BaseCPMImpl.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/BaseCPMImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/BaseCPMImpl.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/BaseCPMImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/CPEConfig.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/CPEConfig.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/CPEConfig.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/CPEConfig.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/CPMException.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/CPMException.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/CPMException.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/CPMException.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/CPMImpl.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/CPMImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/CPMImpl.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/CPMImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/Checkpoint.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/Checkpoint.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/Checkpoint.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/Checkpoint.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/CheckpointConfig.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/CheckpointConfig.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/CheckpointConfig.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/CheckpointConfig.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/CheckpointData.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/CheckpointData.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/CheckpointData.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/CheckpointData.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/Constants.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/Constants.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/Constants.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/Constants.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/StatusCallbackListenerImpl.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/StatusCallbackListenerImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/StatusCallbackListenerImpl.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/StatusCallbackListenerImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/CPEContext.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/CPEContext.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/CPEContext.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/CPEContext.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/CPEFactory.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/CPEFactory.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/CPEFactory.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/CPEFactory.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/CasObjectNetworkCasProcessorImpl.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/CasObjectNetworkCasProcessorImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/CasObjectNetworkCasProcessorImpl.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/CasObjectNetworkCasProcessorImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/CasProcessorConfigurationJAXBImpl.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/CasProcessorConfigurationJAXBImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/CasProcessorConfigurationJAXBImpl.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/CasProcessorConfigurationJAXBImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/NetworkCasProcessorImpl.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/NetworkCasProcessorImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/NetworkCasProcessorImpl.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/NetworkCasProcessorImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/ProcessingContainer_Impl.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/ProcessingContainer_Impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/ProcessingContainer_Impl.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/ProcessingContainer_Impl.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/ServiceProxyPool.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/ServiceProxyPool.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/ServiceProxyPool.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/ServiceProxyPool.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/CPEDeployerDefaultImpl.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/CPEDeployerDefaultImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/CPEDeployerDefaultImpl.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/CPEDeployerDefaultImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/DeployFactory.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/DeployFactory.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/DeployFactory.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/DeployFactory.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/FencedProcessReaper.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/FencedProcessReaper.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/FencedProcessReaper.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/FencedProcessReaper.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/JavaApplication.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/JavaApplication.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/JavaApplication.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/JavaApplication.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/NonJavaApplication.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/NonJavaApplication.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/NonJavaApplication.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/NonJavaApplication.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/RunnableApplication.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/RunnableApplication.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/RunnableApplication.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/RunnableApplication.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/VinciTAP.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/VinciTAP.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/VinciTAP.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/VinciTAP.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/socket/OFSocketTransportImpl.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/socket/OFSocketTransportImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/socket/OFSocketTransportImpl.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/socket/OFSocketTransportImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/socket/ProcessControllerAdapter.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/socket/ProcessControllerAdapter.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/socket/ProcessControllerAdapter.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/socket/ProcessControllerAdapter.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/socket/SocketCasProcessorDeployer.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/socket/SocketCasProcessorDeployer.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/socket/SocketCasProcessorDeployer.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/socket/SocketCasProcessorDeployer.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/socket/SocketTransport.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/socket/SocketTransport.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/socket/SocketTransport.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/socket/SocketTransport.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/vinci/VinciCasProcessorDeployer.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/vinci/VinciCasProcessorDeployer.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/vinci/VinciCasProcessorDeployer.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/vinci/VinciCasProcessorDeployer.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/vns/LocalVNS.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/vns/LocalVNS.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/vns/LocalVNS.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/vns/LocalVNS.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/vns/VNSQuery.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/vns/VNSQuery.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/vns/VNSQuery.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/vns/VNSQuery.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/vns/VinciServiceInfo.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/vns/VinciServiceInfo.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/vns/VinciServiceInfo.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/vns/VinciServiceInfo.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/ArtifactProducer.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/ArtifactProducer.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/ArtifactProducer.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/ArtifactProducer.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/BoundedWorkQueue.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/BoundedWorkQueue.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/BoundedWorkQueue.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/BoundedWorkQueue.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/CPECasPool.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/CPECasPool.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/CPECasPool.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/CPECasPool.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/CPMChunkTimeoutException.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/CPMChunkTimeoutException.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/CPMChunkTimeoutException.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/CPMChunkTimeoutException.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/CPMEngine.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/CPMEngine.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/CPMEngine.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/CPMEngine.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/CPMThreadGroup.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/CPMThreadGroup.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/CPMThreadGroup.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/CPMThreadGroup.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/ConsumerCasUtils.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/ConsumerCasUtils.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/ConsumerCasUtils.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/ConsumerCasUtils.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/DebugControlThread.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/DebugControlThread.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/DebugControlThread.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/DebugControlThread.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/EOFToken.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/EOFToken.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/EOFToken.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/EOFToken.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/NonThreadedProcessingUnit.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/NonThreadedProcessingUnit.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/NonThreadedProcessingUnit.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/NonThreadedProcessingUnit.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/ProcessingUnit.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/ProcessingUnit.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/ProcessingUnit.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/ProcessingUnit.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/SequencedQueue.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/SequencedQueue.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/SequencedQueue.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/SequencedQueue.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/WorkUnit.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/WorkUnit.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/WorkUnit.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/WorkUnit.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/CPMUtils.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/CPMUtils.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/CPMUtils.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/CPMUtils.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/CasMetaData.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/CasMetaData.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/CasMetaData.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/CasMetaData.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/ChunkMetadata.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/ChunkMetadata.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/ChunkMetadata.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/ChunkMetadata.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/ConfigurableFeature.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/ConfigurableFeature.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/ConfigurableFeature.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/ConfigurableFeature.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/CpmLocalizedMessage.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/CpmLocalizedMessage.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/CpmLocalizedMessage.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/CpmLocalizedMessage.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/Execute.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/Execute.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/Execute.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/Execute.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/ExpirationTimer.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/ExpirationTimer.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/ExpirationTimer.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/ExpirationTimer.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/FeatureMap.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/FeatureMap.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/FeatureMap.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/FeatureMap.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/Filter.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/Filter.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/Filter.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/Filter.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/JavaTimer.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/JavaTimer.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/JavaTimer.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/JavaTimer.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/QueueEntity.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/QueueEntity.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/QueueEntity.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/QueueEntity.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/Timer.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/Timer.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/Timer.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/Timer.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/TimerFactory.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/TimerFactory.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/TimerFactory.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/TimerFactory.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/TypeComplianceConverterImpl.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/TypeComplianceConverterImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/TypeComplianceConverterImpl.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/TypeComplianceConverterImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/ValuePair.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/ValuePair.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/ValuePair.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/ValuePair.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/vinci/DATACasUtils.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/vinci/DATACasUtils.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/vinci/DATACasUtils.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/vinci/DATACasUtils.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/vinci/Vinci.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/vinci/Vinci.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/vinci/Vinci.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/vinci/Vinci.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/vinci/cas_data/VinciPrimitiveValue.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/vinci/cas_data/VinciPrimitiveValue.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/vinci/cas_data/VinciPrimitiveValue.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/vinci/cas_data/VinciPrimitiveValue.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/CpeDefaultValues.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/CpeDefaultValues.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/CpeDefaultValues.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/CpeDefaultValues.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorConfigurationParameterSettingsImpl.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorConfigurationParameterSettingsImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorConfigurationParameterSettingsImpl.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorConfigurationParameterSettingsImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorCpeObject.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorCpeObject.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorCpeObject.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorCpeObject.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorDeploymentParamImpl.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorDeploymentParamImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorDeploymentParamImpl.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorDeploymentParamImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorDeploymentParamsImpl.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorDeploymentParamsImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorDeploymentParamsImpl.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorDeploymentParamsImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorErrorHandlingImpl.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorErrorHandlingImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorErrorHandlingImpl.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorErrorHandlingImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorErrorRateThresholdImpl.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorErrorRateThresholdImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorErrorRateThresholdImpl.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorErrorRateThresholdImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorExecArgImpl.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorExecArgImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorExecArgImpl.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorExecArgImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorExecArgsImpl.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorExecArgsImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorExecArgsImpl.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorExecArgsImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorExecutableImpl.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorExecutableImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorExecutableImpl.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorExecutableImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorFilterImpl.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorFilterImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorFilterImpl.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorFilterImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorMaxRestartsImpl.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorMaxRestartsImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorMaxRestartsImpl.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorMaxRestartsImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorRunInSeperateProcessImpl.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorRunInSeperateProcessImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorRunInSeperateProcessImpl.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorRunInSeperateProcessImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorRuntimeEnvParamImpl.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorRuntimeEnvParamImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorRuntimeEnvParamImpl.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorRuntimeEnvParamImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorTimeoutImpl.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorTimeoutImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorTimeoutImpl.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorTimeoutImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeCasProcessorsImpl.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeCasProcessorsImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeCasProcessorsImpl.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeCasProcessorsImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeCheckpointImpl.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeCheckpointImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeCheckpointImpl.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeCheckpointImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeCollectionReaderCasInitializerImpl.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeCollectionReaderCasInitializerImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeCollectionReaderCasInitializerImpl.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeCollectionReaderCasInitializerImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeCollectionReaderImpl.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeCollectionReaderImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeCollectionReaderImpl.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeCollectionReaderImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeCollectionReaderIteratorImpl.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeCollectionReaderIteratorImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeCollectionReaderIteratorImpl.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeCollectionReaderIteratorImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeComponentDescriptorImpl.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeComponentDescriptorImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeComponentDescriptorImpl.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeComponentDescriptorImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeConfigurationImpl.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeConfigurationImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeConfigurationImpl.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeConfigurationImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeDescriptionImpl.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeDescriptionImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeDescriptionImpl.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeDescriptionImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeDescriptorFactory.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeDescriptorFactory.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeDescriptorFactory.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeDescriptorFactory.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeIncludeImpl.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeIncludeImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeIncludeImpl.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeIncludeImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeIntegratedCasProcessorImpl.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeIntegratedCasProcessorImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeIntegratedCasProcessorImpl.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeIntegratedCasProcessorImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeLocalCasProcessorImpl.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeLocalCasProcessorImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeLocalCasProcessorImpl.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeLocalCasProcessorImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeObject.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeObject.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeObject.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeObject.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeRemoteCasProcessorImpl.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeRemoteCasProcessorImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeRemoteCasProcessorImpl.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeRemoteCasProcessorImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeResourceManagerConfigurationImpl.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeResourceManagerConfigurationImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeResourceManagerConfigurationImpl.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeResourceManagerConfigurationImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeSofaMappingImpl.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeSofaMappingImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeSofaMappingImpl.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeSofaMappingImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeSofaMappingsImpl.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeSofaMappingsImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeSofaMappingsImpl.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeSofaMappingsImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeTimerImpl.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeTimerImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeTimerImpl.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeTimerImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/NameValuePairImpl.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/NameValuePairImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/NameValuePairImpl.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/NameValuePairImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/OutputQueue_impl.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/OutputQueue_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/OutputQueue_impl.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/OutputQueue_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/resources/org/apache/uima/collection/impl/cpm/container/defaultCpeDescriptor.xml b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/resources/org/apache/uima/collection/impl/cpm/container/defaultCpeDescriptor.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/resources/org/apache/uima/collection/impl/cpm/container/defaultCpeDescriptor.xml rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/resources/org/apache/uima/collection/impl/cpm/container/defaultCpeDescriptor.xml
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/main/resources/org/apache/uima/collection/impl/cpm/cpm_messages.properties b/uimaj-2.2.1-incubating/uimaj-cpe/src/main/resources/org/apache/uima/collection/impl/cpm/cpm_messages.properties similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/main/resources/org/apache/uima/collection/impl/cpm/cpm_messages.properties rename to uimaj-2.2.1-incubating/uimaj-cpe/src/main/resources/org/apache/uima/collection/impl/cpm/cpm_messages.properties
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/test/java/org/apache/uima/analysis_engine/impl/SofaNamingInAggregateTest.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/test/java/org/apache/uima/analysis_engine/impl/SofaNamingInAggregateTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/test/java/org/apache/uima/analysis_engine/impl/SofaNamingInAggregateTest.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/test/java/org/apache/uima/analysis_engine/impl/SofaNamingInAggregateTest.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/test/java/org/apache/uima/analysis_engine/impl/TestAnnotator.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/test/java/org/apache/uima/analysis_engine/impl/TestAnnotator.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/test/java/org/apache/uima/analysis_engine/impl/TestAnnotator.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/test/java/org/apache/uima/analysis_engine/impl/TestAnnotator.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/test/java/org/apache/uima/cas/impl/CasTestUtil.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/test/java/org/apache/uima/cas/impl/CasTestUtil.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/test/java/org/apache/uima/cas/impl/CasTestUtil.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/test/java/org/apache/uima/cas/impl/CasTestUtil.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/CasHeapSizeTestCollectionReader.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/CasHeapSizeTestCollectionReader.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/CasHeapSizeTestCollectionReader.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/CasHeapSizeTestCollectionReader.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/CollectionProcessingEngine_implTest.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/CollectionProcessingEngine_implTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/CollectionProcessingEngine_implTest.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/CollectionProcessingEngine_implTest.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/SingleDocCollectionReader.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/SingleDocCollectionReader.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/SingleDocCollectionReader.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/SingleDocCollectionReader.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/TestCasInitializer.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/TestCasInitializer.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/TestCasInitializer.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/TestCasInitializer.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/TestCasMultiplier.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/TestCasMultiplier.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/TestCasMultiplier.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/TestCasMultiplier.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/CasPoolTest.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/CasPoolTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/CasPoolTest.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/CasPoolTest.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/CpeCasProcessorAPI_Test.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/CpeCasProcessorAPI_Test.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/CpeCasProcessorAPI_Test.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/CpeCasProcessorAPI_Test.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/CpeDescriptorSerialization_Test.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/CpeDescriptorSerialization_Test.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/CpeDescriptorSerialization_Test.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/CpeDescriptorSerialization_Test.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/CpeImportTest.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/CpeImportTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/CpeImportTest.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/CpeImportTest.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/CpmAE_ErrorTest.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/CpmAE_ErrorTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/CpmAE_ErrorTest.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/CpmAE_ErrorTest.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/CpmCasConsumer_ErrorTest.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/CpmCasConsumer_ErrorTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/CpmCasConsumer_ErrorTest.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/CpmCasConsumer_ErrorTest.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/CpmCollectionReader_ErrorTest.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/CpmCollectionReader_ErrorTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/CpmCollectionReader_ErrorTest.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/CpmCollectionReader_ErrorTest.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/CpmInitTest.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/CpmInitTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/CpmInitTest.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/CpmInitTest.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/CpmProcessingTest.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/CpmProcessingTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/CpmProcessingTest.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/CpmProcessingTest.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/CpmStopTest.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/CpmStopTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/CpmStopTest.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/CpmStopTest.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/PearCasPoolTest.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/PearCasPoolTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/PearCasPoolTest.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/PearCasPoolTest.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/SofaCPE_SofaUnawareCC_Test.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/SofaCPE_SofaUnawareCC_Test.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/SofaCPE_SofaUnawareCC_Test.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/SofaCPE_SofaUnawareCC_Test.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/SofaCPE_Test.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/SofaCPE_Test.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/SofaCPE_Test.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/SofaCPE_Test.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/SofaMixedCPE_Test.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/SofaMixedCPE_Test.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/SofaMixedCPE_Test.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/SofaMixedCPE_Test.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/utils/DescriptorMakeUtil.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/utils/DescriptorMakeUtil.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/utils/DescriptorMakeUtil.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/utils/DescriptorMakeUtil.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/utils/ErrorTestAnnotator.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/utils/ErrorTestAnnotator.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/utils/ErrorTestAnnotator.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/utils/ErrorTestAnnotator.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/utils/ErrorTestCasConsumer.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/utils/ErrorTestCasConsumer.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/utils/ErrorTestCasConsumer.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/utils/ErrorTestCasConsumer.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/utils/ErrorTestCollectionReader.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/utils/ErrorTestCollectionReader.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/utils/ErrorTestCollectionReader.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/utils/ErrorTestCollectionReader.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/utils/FunctionErrorStore.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/utils/FunctionErrorStore.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/utils/FunctionErrorStore.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/utils/FunctionErrorStore.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/utils/SlowAnnotator.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/utils/SlowAnnotator.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/utils/SlowAnnotator.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/utils/SlowAnnotator.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/utils/TestStatusCallbackListener.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/utils/TestStatusCallbackListener.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/utils/TestStatusCallbackListener.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/utils/TestStatusCallbackListener.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/test/java/org/apache/uima/examples/cpm/sofa/CpmTestDriver.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/test/java/org/apache/uima/examples/cpm/sofa/CpmTestDriver.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/test/java/org/apache/uima/examples/cpm/sofa/CpmTestDriver.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/test/java/org/apache/uima/examples/cpm/sofa/CpmTestDriver.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/test/java/org/apache/uima/examples/cpm/sofa/SofaCasConsumer.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/test/java/org/apache/uima/examples/cpm/sofa/SofaCasConsumer.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/test/java/org/apache/uima/examples/cpm/sofa/SofaCasConsumer.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/test/java/org/apache/uima/examples/cpm/sofa/SofaCasConsumer.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/test/java/org/apache/uima/examples/cpm/sofa/SofaCasInitializer.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/test/java/org/apache/uima/examples/cpm/sofa/SofaCasInitializer.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/test/java/org/apache/uima/examples/cpm/sofa/SofaCasInitializer.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/test/java/org/apache/uima/examples/cpm/sofa/SofaCasInitializer.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/test/java/org/apache/uima/examples/cpm/sofa/SofaCollectionReader.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/test/java/org/apache/uima/examples/cpm/sofa/SofaCollectionReader.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/test/java/org/apache/uima/examples/cpm/sofa/SofaCollectionReader.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/test/java/org/apache/uima/examples/cpm/sofa/SofaCollectionReader.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/test/java/org/apache/uima/examples/cpm/sofa/SofaUnawareCasConsumer.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/test/java/org/apache/uima/examples/cpm/sofa/SofaUnawareCasConsumer.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/test/java/org/apache/uima/examples/cpm/sofa/SofaUnawareCasConsumer.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/test/java/org/apache/uima/examples/cpm/sofa/SofaUnawareCasConsumer.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/test/java/org/apache/uima/examples/cpm/sofa/TcasCollectionReader.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/test/java/org/apache/uima/examples/cpm/sofa/TcasCollectionReader.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/test/java/org/apache/uima/examples/cpm/sofa/TcasCollectionReader.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/test/java/org/apache/uima/examples/cpm/sofa/TcasCollectionReader.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/test/java/org/apache/uima/examples/cpm/sofa/TcasTransAnnotator.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/test/java/org/apache/uima/examples/cpm/sofa/TcasTransAnnotator.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/test/java/org/apache/uima/examples/cpm/sofa/TcasTransAnnotator.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/test/java/org/apache/uima/examples/cpm/sofa/TcasTransAnnotator.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/test/java/org/apache/uima/examples/cpm/sofa/TransAnnotator.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/test/java/org/apache/uima/examples/cpm/sofa/TransAnnotator.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/test/java/org/apache/uima/examples/cpm/sofa/TransAnnotator.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/test/java/org/apache/uima/examples/cpm/sofa/TransAnnotator.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/test/java/org/apache/uima/pear/util/ComponentCategoryTest.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/test/java/org/apache/uima/pear/util/ComponentCategoryTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/test/java/org/apache/uima/pear/util/ComponentCategoryTest.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/test/java/org/apache/uima/pear/util/ComponentCategoryTest.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/test/java/org/apache/uima/resource/impl/TestResourceInterface.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/test/java/org/apache/uima/resource/impl/TestResourceInterface.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/test/java/org/apache/uima/resource/impl/TestResourceInterface.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/test/java/org/apache/uima/resource/impl/TestResourceInterface.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/test/java/org/apache/uima/resource/impl/TestResourceInterface_impl.java b/uimaj-2.2.1-incubating/uimaj-cpe/src/test/java/org/apache/uima/resource/impl/TestResourceInterface_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/test/java/org/apache/uima/resource/impl/TestResourceInterface_impl.java rename to uimaj-2.2.1-incubating/uimaj-cpe/src/test/java/org/apache/uima/resource/impl/TestResourceInterface_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/test/resources/CollectionProcessingEngineImplTest/AggregateWrappingCasMultiplier.xml b/uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/CollectionProcessingEngineImplTest/AggregateWrappingCasMultiplier.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/test/resources/CollectionProcessingEngineImplTest/AggregateWrappingCasMultiplier.xml rename to uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/CollectionProcessingEngineImplTest/AggregateWrappingCasMultiplier.xml
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/test/resources/CollectionProcessingEngineImplTest/CasConsumerDescription.xml b/uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/CollectionProcessingEngineImplTest/CasConsumerDescription.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/test/resources/CollectionProcessingEngineImplTest/CasConsumerDescription.xml rename to uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/CollectionProcessingEngineImplTest/CasConsumerDescription.xml
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/test/resources/CollectionProcessingEngineImplTest/CasHeapSizeTestCollectionReader.xml b/uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/CollectionProcessingEngineImplTest/CasHeapSizeTestCollectionReader.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/test/resources/CollectionProcessingEngineImplTest/CasHeapSizeTestCollectionReader.xml rename to uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/CollectionProcessingEngineImplTest/CasHeapSizeTestCollectionReader.xml
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/test/resources/CollectionProcessingEngineImplTest/CpeImportDataPathTest.xml b/uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/CollectionProcessingEngineImplTest/CpeImportDataPathTest.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/test/resources/CollectionProcessingEngineImplTest/CpeImportDataPathTest.xml rename to uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/CollectionProcessingEngineImplTest/CpeImportDataPathTest.xml
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/test/resources/CollectionProcessingEngineImplTest/CpeImportTest.xml b/uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/CollectionProcessingEngineImplTest/CpeImportTest.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/test/resources/CollectionProcessingEngineImplTest/CpeImportTest.xml rename to uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/CollectionProcessingEngineImplTest/CpeImportTest.xml
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/test/resources/CollectionProcessingEngineImplTest/ResourceManagerConfiguration.xml b/uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/CollectionProcessingEngineImplTest/ResourceManagerConfiguration.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/test/resources/CollectionProcessingEngineImplTest/ResourceManagerConfiguration.xml rename to uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/CollectionProcessingEngineImplTest/ResourceManagerConfiguration.xml
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/test/resources/CollectionProcessingEngineImplTest/SingleDocCollectionReader.xml b/uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/CollectionProcessingEngineImplTest/SingleDocCollectionReader.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/test/resources/CollectionProcessingEngineImplTest/SingleDocCollectionReader.xml rename to uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/CollectionProcessingEngineImplTest/SingleDocCollectionReader.xml
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/test/resources/CollectionProcessingEngineImplTest/TestCasInitializer.xml b/uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/CollectionProcessingEngineImplTest/TestCasInitializer.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/test/resources/CollectionProcessingEngineImplTest/TestCasInitializer.xml rename to uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/CollectionProcessingEngineImplTest/TestCasInitializer.xml
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/test/resources/CollectionProcessingEngineImplTest/TestCasMultiplier.xml b/uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/CollectionProcessingEngineImplTest/TestCasMultiplier.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/test/resources/CollectionProcessingEngineImplTest/TestCasMultiplier.xml rename to uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/CollectionProcessingEngineImplTest/TestCasMultiplier.xml
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/test/resources/CollectionProcessingEngineImplTest/TestPrimitiveTae1.xml b/uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/CollectionProcessingEngineImplTest/TestPrimitiveTae1.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/test/resources/CollectionProcessingEngineImplTest/TestPrimitiveTae1.xml rename to uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/CollectionProcessingEngineImplTest/TestPrimitiveTae1.xml
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/test/resources/CollectionProcessingEngineImplTest/cpeWithWrappedCasMultiplier.xml b/uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/CollectionProcessingEngineImplTest/cpeWithWrappedCasMultiplier.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/test/resources/CollectionProcessingEngineImplTest/cpeWithWrappedCasMultiplier.xml rename to uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/CollectionProcessingEngineImplTest/cpeWithWrappedCasMultiplier.xml
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/test/resources/CollectionProcessingEngineImplTest/externalResourceTestCpe.xml b/uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/CollectionProcessingEngineImplTest/externalResourceTestCpe.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/test/resources/CollectionProcessingEngineImplTest/externalResourceTestCpe.xml rename to uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/CollectionProcessingEngineImplTest/externalResourceTestCpe.xml
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/test/resources/CollectionProcessingEngineImplTest/imports/test/ErrorTestAnnotator.xml b/uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/CollectionProcessingEngineImplTest/imports/test/ErrorTestAnnotator.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/test/resources/CollectionProcessingEngineImplTest/imports/test/ErrorTestAnnotator.xml rename to uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/CollectionProcessingEngineImplTest/imports/test/ErrorTestAnnotator.xml
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/test/resources/CollectionProcessingEngineImplTest/imports/test/ErrorTestCasConsumer.xml b/uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/CollectionProcessingEngineImplTest/imports/test/ErrorTestCasConsumer.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/test/resources/CollectionProcessingEngineImplTest/imports/test/ErrorTestCasConsumer.xml rename to uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/CollectionProcessingEngineImplTest/imports/test/ErrorTestCasConsumer.xml
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/test/resources/CollectionProcessingEngineImplTest/imports/test/ErrorTestCollectionReader.xml b/uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/CollectionProcessingEngineImplTest/imports/test/ErrorTestCollectionReader.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/test/resources/CollectionProcessingEngineImplTest/imports/test/ErrorTestCollectionReader.xml rename to uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/CollectionProcessingEngineImplTest/imports/test/ErrorTestCollectionReader.xml
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/test/resources/CollectionProcessingEngineImplTest/performanceTuningSettingsTestCpe.xml b/uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/CollectionProcessingEngineImplTest/performanceTuningSettingsTestCpe.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/test/resources/CollectionProcessingEngineImplTest/performanceTuningSettingsTestCpe.xml rename to uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/CollectionProcessingEngineImplTest/performanceTuningSettingsTestCpe.xml
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/test/resources/CollectionProcessingEngineImplTest/testDataFile.dat b/uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/CollectionProcessingEngineImplTest/testDataFile.dat similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/test/resources/CollectionProcessingEngineImplTest/testDataFile.dat rename to uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/CollectionProcessingEngineImplTest/testDataFile.dat
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/test/resources/CpeSofaTest/PersonTitleAnnotator.xml b/uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/CpeSofaTest/PersonTitleAnnotator.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/test/resources/CpeSofaTest/PersonTitleAnnotator.xml rename to uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/CpeSofaTest/PersonTitleAnnotator.xml
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/test/resources/CpeSofaTest/SofaCPE.xml b/uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/CpeSofaTest/SofaCPE.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/test/resources/CpeSofaTest/SofaCPE.xml rename to uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/CpeSofaTest/SofaCPE.xml
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/test/resources/CpeSofaTest/SofaCPE_SofaUnawareCC.xml b/uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/CpeSofaTest/SofaCPE_SofaUnawareCC.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/test/resources/CpeSofaTest/SofaCPE_SofaUnawareCC.xml rename to uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/CpeSofaTest/SofaCPE_SofaUnawareCC.xml
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/test/resources/CpeSofaTest/SofaCasConsumer.xml b/uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/CpeSofaTest/SofaCasConsumer.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/test/resources/CpeSofaTest/SofaCasConsumer.xml rename to uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/CpeSofaTest/SofaCasConsumer.xml
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/test/resources/CpeSofaTest/SofaCasInitializer.xml b/uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/CpeSofaTest/SofaCasInitializer.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/test/resources/CpeSofaTest/SofaCasInitializer.xml rename to uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/CpeSofaTest/SofaCasInitializer.xml
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/test/resources/CpeSofaTest/SofaCollectionReader.xml b/uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/CpeSofaTest/SofaCollectionReader.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/test/resources/CpeSofaTest/SofaCollectionReader.xml rename to uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/CpeSofaTest/SofaCollectionReader.xml
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/test/resources/CpeSofaTest/SofaFlowController.xml b/uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/CpeSofaTest/SofaFlowController.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/test/resources/CpeSofaTest/SofaFlowController.xml rename to uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/CpeSofaTest/SofaFlowController.xml
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/test/resources/CpeSofaTest/SofaMixedCPE.xml b/uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/CpeSofaTest/SofaMixedCPE.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/test/resources/CpeSofaTest/SofaMixedCPE.xml rename to uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/CpeSofaTest/SofaMixedCPE.xml
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/test/resources/CpeSofaTest/SofaUnawareCasConsumer.xml b/uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/CpeSofaTest/SofaUnawareCasConsumer.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/test/resources/CpeSofaTest/SofaUnawareCasConsumer.xml rename to uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/CpeSofaTest/SofaUnawareCasConsumer.xml
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/test/resources/CpeSofaTest/TCasTransAnnotatorAggregate.xml b/uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/CpeSofaTest/TCasTransAnnotatorAggregate.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/test/resources/CpeSofaTest/TCasTransAnnotatorAggregate.xml rename to uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/CpeSofaTest/TCasTransAnnotatorAggregate.xml
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/test/resources/CpeSofaTest/TcasCollectionReader.xml b/uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/CpeSofaTest/TcasCollectionReader.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/test/resources/CpeSofaTest/TcasCollectionReader.xml rename to uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/CpeSofaTest/TcasCollectionReader.xml
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/test/resources/CpeSofaTest/TcasTransAnnotator.xml b/uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/CpeSofaTest/TcasTransAnnotator.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/test/resources/CpeSofaTest/TcasTransAnnotator.xml rename to uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/CpeSofaTest/TcasTransAnnotator.xml
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/test/resources/CpeSofaTest/TransAnnotator.xml b/uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/CpeSofaTest/TransAnnotator.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/test/resources/CpeSofaTest/TransAnnotator.xml rename to uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/CpeSofaTest/TransAnnotator.xml
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/test/resources/CpeSofaTest/TransAnnotatorAggregate.xml b/uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/CpeSofaTest/TransAnnotatorAggregate.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/test/resources/CpeSofaTest/TransAnnotatorAggregate.xml rename to uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/CpeSofaTest/TransAnnotatorAggregate.xml
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/test/resources/CpeSofaTest/TransAnnotatorAggregateWithoutSofaNameMapping.xml b/uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/CpeSofaTest/TransAnnotatorAggregateWithoutSofaNameMapping.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/test/resources/CpeSofaTest/TransAnnotatorAggregateWithoutSofaNameMapping.xml rename to uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/CpeSofaTest/TransAnnotatorAggregateWithoutSofaNameMapping.xml
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/test/resources/CpeSofaTest/TransAnnotatorAndTestAnnotatorAggregate.xml b/uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/CpeSofaTest/TransAnnotatorAndTestAnnotatorAggregate.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/test/resources/CpeSofaTest/TransAnnotatorAndTestAnnotatorAggregate.xml rename to uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/CpeSofaTest/TransAnnotatorAndTestAnnotatorAggregate.xml
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/test/resources/CpmTests/CpeAPITest/refConf.xml b/uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/CpmTests/CpeAPITest/refConf.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/test/resources/CpmTests/CpeAPITest/refConf.xml rename to uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/CpmTests/CpeAPITest/refConf.xml
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/test/resources/CpmTests/CpeAPITest/refConf2.xml b/uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/CpmTests/CpeAPITest/refConf2.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/test/resources/CpmTests/CpeAPITest/refConf2.xml rename to uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/CpmTests/CpeAPITest/refConf2.xml
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/test/resources/CpmTests/CpeAPITest/refConf3.xml b/uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/CpmTests/CpeAPITest/refConf3.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/test/resources/CpmTests/CpeAPITest/refConf3.xml rename to uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/CpmTests/CpeAPITest/refConf3.xml
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/test/resources/CpmTests/CpeAPITest/testIntegratedDesc.xml b/uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/CpmTests/CpeAPITest/testIntegratedDesc.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/test/resources/CpmTests/CpeAPITest/testIntegratedDesc.xml rename to uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/CpmTests/CpeAPITest/testIntegratedDesc.xml
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/test/resources/CpmTests/CpeAPITest/testLocalDesc.xml b/uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/CpmTests/CpeAPITest/testLocalDesc.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/test/resources/CpmTests/CpeAPITest/testLocalDesc.xml rename to uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/CpmTests/CpeAPITest/testLocalDesc.xml
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/test/resources/CpmTests/CpeAPITest/testRemoteDesc.xml b/uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/CpmTests/CpeAPITest/testRemoteDesc.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/test/resources/CpmTests/CpeAPITest/testRemoteDesc.xml rename to uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/CpmTests/CpeAPITest/testRemoteDesc.xml
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/test/resources/CpmTests/CpeDesc/TmpAnalysisEngine.xml b/uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/CpmTests/CpeDesc/TmpAnalysisEngine.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/test/resources/CpmTests/CpeDesc/TmpAnalysisEngine.xml rename to uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/CpmTests/CpeDesc/TmpAnalysisEngine.xml
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/test/resources/CpmTests/CpeDesc/TmpCasConsumer.xml b/uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/CpmTests/CpeDesc/TmpCasConsumer.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/test/resources/CpmTests/CpeDesc/TmpCasConsumer.xml rename to uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/CpmTests/CpeDesc/TmpCasConsumer.xml
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/test/resources/CpmTests/CpeDesc/TmpCollectionReader.xml b/uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/CpmTests/CpeDesc/TmpCollectionReader.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/test/resources/CpmTests/CpeDesc/TmpCollectionReader.xml rename to uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/CpmTests/CpeDesc/TmpCollectionReader.xml
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/test/resources/CpmTests/ErrorTestAnnotator.xml b/uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/CpmTests/ErrorTestAnnotator.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/test/resources/CpmTests/ErrorTestAnnotator.xml rename to uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/CpmTests/ErrorTestAnnotator.xml
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/test/resources/CpmTests/ErrorTestCasConsumer.xml b/uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/CpmTests/ErrorTestCasConsumer.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/test/resources/CpmTests/ErrorTestCasConsumer.xml rename to uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/CpmTests/ErrorTestCasConsumer.xml
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/test/resources/CpmTests/ErrorTestCollectionReader.xml b/uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/CpmTests/ErrorTestCollectionReader.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/test/resources/CpmTests/ErrorTestCollectionReader.xml rename to uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/CpmTests/ErrorTestCollectionReader.xml
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/test/resources/CpmTests/SlowAnnotator.xml b/uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/CpmTests/SlowAnnotator.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/test/resources/CpmTests/SlowAnnotator.xml rename to uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/CpmTests/SlowAnnotator.xml
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/test/resources/CpmTests/aggrContainingPearSpecifier.xml b/uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/CpmTests/aggrContainingPearSpecifier.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/test/resources/CpmTests/aggrContainingPearSpecifier.xml rename to uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/CpmTests/aggrContainingPearSpecifier.xml
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/test/resources/ResourceTest/DataResource_implTest_tempDataFile.dat b/uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/ResourceTest/DataResource_implTest_tempDataFile.dat similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/test/resources/ResourceTest/DataResource_implTest_tempDataFile.dat rename to uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/ResourceTest/DataResource_implTest_tempDataFile.dat
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/test/resources/ResourceTest/FileLanguageResource_implTest_data_de.dat b/uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/ResourceTest/FileLanguageResource_implTest_data_de.dat similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/test/resources/ResourceTest/FileLanguageResource_implTest_data_de.dat rename to uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/ResourceTest/FileLanguageResource_implTest_data_de.dat
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/test/resources/ResourceTest/FileLanguageResource_implTest_data_en.dat b/uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/ResourceTest/FileLanguageResource_implTest_data_en.dat similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/test/resources/ResourceTest/FileLanguageResource_implTest_data_en.dat rename to uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/ResourceTest/FileLanguageResource_implTest_data_en.dat
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/test/resources/ResourceTest/ResourceManager_implTest_tempDataFile.dat b/uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/ResourceTest/ResourceManager_implTest_tempDataFile.dat similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/test/resources/ResourceTest/ResourceManager_implTest_tempDataFile.dat rename to uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/ResourceTest/ResourceManager_implTest_tempDataFile.dat
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/test/resources/ResourceTest/spaces in dir name/Test.dat b/uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/ResourceTest/spaces in dir name/Test.dat similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/test/resources/ResourceTest/spaces in dir name/Test.dat rename to uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/ResourceTest/spaces in dir name/Test.dat
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/test/resources/pearTests/componentCategoryTests/cpe.xml b/uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/pearTests/componentCategoryTests/cpe.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/test/resources/pearTests/componentCategoryTests/cpe.xml rename to uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/pearTests/componentCategoryTests/cpe.xml
diff --git a/uimaj-2.2.1-06/uimaj-cpe/src/test/resources/pearTests/pearForCPMtest.pear b/uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/pearTests/pearForCPMtest.pear similarity index 100% rename from uimaj-2.2.1-06/uimaj-cpe/src/test/resources/pearTests/pearForCPMtest.pear rename to uimaj-2.2.1-incubating/uimaj-cpe/src/test/resources/pearTests/pearForCPMtest.pear Binary files differ
diff --git a/uimaj-2.2.1-06/uimaj-distr/pom.xml b/uimaj-2.2.1-incubating/uimaj-distr/pom.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-distr/pom.xml rename to uimaj-2.2.1-incubating/uimaj-distr/pom.xml
diff --git a/uimaj-2.2.1-06/uimaj-distr/src/main/assembly/bin.xml b/uimaj-2.2.1-incubating/uimaj-distr/src/main/assembly/bin.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-distr/src/main/assembly/bin.xml rename to uimaj-2.2.1-incubating/uimaj-distr/src/main/assembly/bin.xml
diff --git a/uimaj-2.2.1-06/uimaj-distr/src/main/assembly/src.xml b/uimaj-2.2.1-incubating/uimaj-distr/src/main/assembly/src.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-distr/src/main/assembly/src.xml rename to uimaj-2.2.1-incubating/uimaj-distr/src/main/assembly/src.xml
diff --git a/uimaj-2.2.1-06/uimaj-distr/src/main/build/extractAndBuild.bat b/uimaj-2.2.1-incubating/uimaj-distr/src/main/build/extractAndBuild.bat similarity index 100% rename from uimaj-2.2.1-06/uimaj-distr/src/main/build/extractAndBuild.bat rename to uimaj-2.2.1-incubating/uimaj-distr/src/main/build/extractAndBuild.bat
diff --git a/uimaj-2.2.1-06/uimaj-distr/src/main/build/extractAndBuild.sh b/uimaj-2.2.1-incubating/uimaj-distr/src/main/build/extractAndBuild.sh similarity index 100% rename from uimaj-2.2.1-06/uimaj-distr/src/main/build/extractAndBuild.sh rename to uimaj-2.2.1-incubating/uimaj-distr/src/main/build/extractAndBuild.sh
diff --git a/uimaj-2.2.1-06/uimaj-distr/src/main/build/signRelease.sh b/uimaj-2.2.1-incubating/uimaj-distr/src/main/build/signRelease.sh similarity index 100% rename from uimaj-2.2.1-06/uimaj-distr/src/main/build/signRelease.sh rename to uimaj-2.2.1-incubating/uimaj-distr/src/main/build/signRelease.sh
diff --git a/uimaj-2.2.1-06/uimaj-distr/src/main/properties/FileConsoleLogger.properties b/uimaj-2.2.1-incubating/uimaj-distr/src/main/properties/FileConsoleLogger.properties similarity index 100% rename from uimaj-2.2.1-06/uimaj-distr/src/main/properties/FileConsoleLogger.properties rename to uimaj-2.2.1-incubating/uimaj-distr/src/main/properties/FileConsoleLogger.properties
diff --git a/uimaj-2.2.1-06/uimaj-distr/src/main/properties/Logger.properties b/uimaj-2.2.1-incubating/uimaj-distr/src/main/properties/Logger.properties similarity index 100% rename from uimaj-2.2.1-06/uimaj-distr/src/main/properties/Logger.properties rename to uimaj-2.2.1-incubating/uimaj-distr/src/main/properties/Logger.properties
diff --git a/uimaj-2.2.1-06/uimaj-distr/src/main/readme/DISCLAIMER b/uimaj-2.2.1-incubating/uimaj-distr/src/main/readme/DISCLAIMER similarity index 100% rename from uimaj-2.2.1-06/uimaj-distr/src/main/readme/DISCLAIMER rename to uimaj-2.2.1-incubating/uimaj-distr/src/main/readme/DISCLAIMER
diff --git a/uimaj-2.2.1-06/uimaj-distr/src/main/readme/KEYS b/uimaj-2.2.1-incubating/uimaj-distr/src/main/readme/KEYS similarity index 100% rename from uimaj-2.2.1-06/uimaj-distr/src/main/readme/KEYS rename to uimaj-2.2.1-incubating/uimaj-distr/src/main/readme/KEYS
diff --git a/uimaj-2.2.1-06/uimaj-distr/src/main/readme/LICENSE b/uimaj-2.2.1-incubating/uimaj-distr/src/main/readme/LICENSE similarity index 100% rename from uimaj-2.2.1-06/uimaj-distr/src/main/readme/LICENSE rename to uimaj-2.2.1-incubating/uimaj-distr/src/main/readme/LICENSE
diff --git a/uimaj-2.2.1-06/uimaj-distr/src/main/readme/NOTICE b/uimaj-2.2.1-incubating/uimaj-distr/src/main/readme/NOTICE similarity index 100% rename from uimaj-2.2.1-06/uimaj-distr/src/main/readme/NOTICE rename to uimaj-2.2.1-incubating/uimaj-distr/src/main/readme/NOTICE
diff --git a/uimaj-2.2.1-06/uimaj-distr/src/main/readme/README b/uimaj-2.2.1-incubating/uimaj-distr/src/main/readme/README similarity index 100% rename from uimaj-2.2.1-06/uimaj-distr/src/main/readme/README rename to uimaj-2.2.1-incubating/uimaj-distr/src/main/readme/README
diff --git a/uimaj-2.2.1-06/uimaj-distr/src/main/readme/RELEASE_NOTES b/uimaj-2.2.1-incubating/uimaj-distr/src/main/readme/RELEASE_NOTES similarity index 100% rename from uimaj-2.2.1-06/uimaj-distr/src/main/readme/RELEASE_NOTES rename to uimaj-2.2.1-incubating/uimaj-distr/src/main/readme/RELEASE_NOTES
diff --git a/uimaj-2.2.1-06/uimaj-distr/src/main/readme/RELEASE_NOTES.html b/uimaj-2.2.1-incubating/uimaj-distr/src/main/readme/RELEASE_NOTES.html similarity index 100% rename from uimaj-2.2.1-06/uimaj-distr/src/main/readme/RELEASE_NOTES.html rename to uimaj-2.2.1-incubating/uimaj-distr/src/main/readme/RELEASE_NOTES.html
diff --git a/uimaj-2.2.1-06/uimaj-distr/src/main/readme_src/README b/uimaj-2.2.1-incubating/uimaj-distr/src/main/readme_src/README similarity index 100% rename from uimaj-2.2.1-06/uimaj-distr/src/main/readme_src/README rename to uimaj-2.2.1-incubating/uimaj-distr/src/main/readme_src/README
diff --git a/uimaj-2.2.1-06/uimaj-distr/src/main/readme_src/addSourceToJars.bat b/uimaj-2.2.1-incubating/uimaj-distr/src/main/readme_src/addSourceToJars.bat similarity index 100% rename from uimaj-2.2.1-06/uimaj-distr/src/main/readme_src/addSourceToJars.bat rename to uimaj-2.2.1-incubating/uimaj-distr/src/main/readme_src/addSourceToJars.bat
diff --git a/uimaj-2.2.1-06/uimaj-distr/src/main/readme_src/addSourceToJars.sh b/uimaj-2.2.1-incubating/uimaj-distr/src/main/readme_src/addSourceToJars.sh similarity index 100% rename from uimaj-2.2.1-06/uimaj-distr/src/main/readme_src/addSourceToJars.sh rename to uimaj-2.2.1-incubating/uimaj-distr/src/main/readme_src/addSourceToJars.sh
diff --git a/uimaj-2.2.1-06/uimaj-distr/src/main/scripts/adjustExamplePaths.bat b/uimaj-2.2.1-incubating/uimaj-distr/src/main/scripts/adjustExamplePaths.bat similarity index 100% rename from uimaj-2.2.1-06/uimaj-distr/src/main/scripts/adjustExamplePaths.bat rename to uimaj-2.2.1-incubating/uimaj-distr/src/main/scripts/adjustExamplePaths.bat
diff --git a/uimaj-2.2.1-06/uimaj-distr/src/main/scripts/adjustExamplePaths.sh b/uimaj-2.2.1-incubating/uimaj-distr/src/main/scripts/adjustExamplePaths.sh similarity index 100% rename from uimaj-2.2.1-06/uimaj-distr/src/main/scripts/adjustExamplePaths.sh rename to uimaj-2.2.1-incubating/uimaj-distr/src/main/scripts/adjustExamplePaths.sh
diff --git a/uimaj-2.2.1-06/uimaj-distr/src/main/scripts/annotationViewer.bat b/uimaj-2.2.1-incubating/uimaj-distr/src/main/scripts/annotationViewer.bat similarity index 100% rename from uimaj-2.2.1-06/uimaj-distr/src/main/scripts/annotationViewer.bat rename to uimaj-2.2.1-incubating/uimaj-distr/src/main/scripts/annotationViewer.bat
diff --git a/uimaj-2.2.1-06/uimaj-distr/src/main/scripts/annotationViewer.sh b/uimaj-2.2.1-incubating/uimaj-distr/src/main/scripts/annotationViewer.sh similarity index 100% rename from uimaj-2.2.1-06/uimaj-distr/src/main/scripts/annotationViewer.sh rename to uimaj-2.2.1-incubating/uimaj-distr/src/main/scripts/annotationViewer.sh
diff --git a/uimaj-2.2.1-06/uimaj-distr/src/main/scripts/cpeGui.bat b/uimaj-2.2.1-incubating/uimaj-distr/src/main/scripts/cpeGui.bat similarity index 100% rename from uimaj-2.2.1-06/uimaj-distr/src/main/scripts/cpeGui.bat rename to uimaj-2.2.1-incubating/uimaj-distr/src/main/scripts/cpeGui.bat
diff --git a/uimaj-2.2.1-06/uimaj-distr/src/main/scripts/cpeGui.sh b/uimaj-2.2.1-incubating/uimaj-distr/src/main/scripts/cpeGui.sh similarity index 100% rename from uimaj-2.2.1-06/uimaj-distr/src/main/scripts/cpeGui.sh rename to uimaj-2.2.1-incubating/uimaj-distr/src/main/scripts/cpeGui.sh
diff --git a/uimaj-2.2.1-06/uimaj-distr/src/main/scripts/cvd.bat b/uimaj-2.2.1-incubating/uimaj-distr/src/main/scripts/cvd.bat similarity index 100% rename from uimaj-2.2.1-06/uimaj-distr/src/main/scripts/cvd.bat rename to uimaj-2.2.1-incubating/uimaj-distr/src/main/scripts/cvd.bat
diff --git a/uimaj-2.2.1-06/uimaj-distr/src/main/scripts/cvd.sh b/uimaj-2.2.1-incubating/uimaj-distr/src/main/scripts/cvd.sh similarity index 100% rename from uimaj-2.2.1-06/uimaj-distr/src/main/scripts/cvd.sh rename to uimaj-2.2.1-incubating/uimaj-distr/src/main/scripts/cvd.sh
diff --git a/uimaj-2.2.1-06/uimaj-distr/src/main/scripts/deploytool.bat b/uimaj-2.2.1-incubating/uimaj-distr/src/main/scripts/deploytool.bat similarity index 100% rename from uimaj-2.2.1-06/uimaj-distr/src/main/scripts/deploytool.bat rename to uimaj-2.2.1-incubating/uimaj-distr/src/main/scripts/deploytool.bat
diff --git a/uimaj-2.2.1-06/uimaj-distr/src/main/scripts/deploytool.sh b/uimaj-2.2.1-incubating/uimaj-distr/src/main/scripts/deploytool.sh similarity index 100% rename from uimaj-2.2.1-06/uimaj-distr/src/main/scripts/deploytool.sh rename to uimaj-2.2.1-incubating/uimaj-distr/src/main/scripts/deploytool.sh
diff --git a/uimaj-2.2.1-06/uimaj-distr/src/main/scripts/documentAnalyzer.bat b/uimaj-2.2.1-incubating/uimaj-distr/src/main/scripts/documentAnalyzer.bat similarity index 100% rename from uimaj-2.2.1-06/uimaj-distr/src/main/scripts/documentAnalyzer.bat rename to uimaj-2.2.1-incubating/uimaj-distr/src/main/scripts/documentAnalyzer.bat
diff --git a/uimaj-2.2.1-06/uimaj-distr/src/main/scripts/documentAnalyzer.sh b/uimaj-2.2.1-incubating/uimaj-distr/src/main/scripts/documentAnalyzer.sh similarity index 100% rename from uimaj-2.2.1-06/uimaj-distr/src/main/scripts/documentAnalyzer.sh rename to uimaj-2.2.1-incubating/uimaj-distr/src/main/scripts/documentAnalyzer.sh
diff --git a/uimaj-2.2.1-06/uimaj-distr/src/main/scripts/ibmUimaToApacheUima.bat b/uimaj-2.2.1-incubating/uimaj-distr/src/main/scripts/ibmUimaToApacheUima.bat similarity index 100% rename from uimaj-2.2.1-06/uimaj-distr/src/main/scripts/ibmUimaToApacheUima.bat rename to uimaj-2.2.1-incubating/uimaj-distr/src/main/scripts/ibmUimaToApacheUima.bat
diff --git a/uimaj-2.2.1-06/uimaj-distr/src/main/scripts/ibmUimaToApacheUima.sh b/uimaj-2.2.1-incubating/uimaj-distr/src/main/scripts/ibmUimaToApacheUima.sh similarity index 100% rename from uimaj-2.2.1-06/uimaj-distr/src/main/scripts/ibmUimaToApacheUima.sh rename to uimaj-2.2.1-incubating/uimaj-distr/src/main/scripts/ibmUimaToApacheUima.sh
diff --git a/uimaj-2.2.1-06/uimaj-distr/src/main/scripts/jcasgen.bat b/uimaj-2.2.1-incubating/uimaj-distr/src/main/scripts/jcasgen.bat similarity index 100% rename from uimaj-2.2.1-06/uimaj-distr/src/main/scripts/jcasgen.bat rename to uimaj-2.2.1-incubating/uimaj-distr/src/main/scripts/jcasgen.bat
diff --git a/uimaj-2.2.1-06/uimaj-distr/src/main/scripts/jcasgen.sh b/uimaj-2.2.1-incubating/uimaj-distr/src/main/scripts/jcasgen.sh similarity index 100% rename from uimaj-2.2.1-06/uimaj-distr/src/main/scripts/jcasgen.sh rename to uimaj-2.2.1-incubating/uimaj-distr/src/main/scripts/jcasgen.sh
diff --git a/uimaj-2.2.1-06/uimaj-distr/src/main/scripts/jcasgen_merge.bat b/uimaj-2.2.1-incubating/uimaj-distr/src/main/scripts/jcasgen_merge.bat similarity index 100% rename from uimaj-2.2.1-06/uimaj-distr/src/main/scripts/jcasgen_merge.bat rename to uimaj-2.2.1-incubating/uimaj-distr/src/main/scripts/jcasgen_merge.bat
diff --git a/uimaj-2.2.1-06/uimaj-distr/src/main/scripts/jcasgen_merge.sh b/uimaj-2.2.1-incubating/uimaj-distr/src/main/scripts/jcasgen_merge.sh similarity index 100% rename from uimaj-2.2.1-06/uimaj-distr/src/main/scripts/jcasgen_merge.sh rename to uimaj-2.2.1-incubating/uimaj-distr/src/main/scripts/jcasgen_merge.sh
diff --git a/uimaj-2.2.1-06/uimaj-distr/src/main/scripts/runAE.bat b/uimaj-2.2.1-incubating/uimaj-distr/src/main/scripts/runAE.bat similarity index 100% rename from uimaj-2.2.1-06/uimaj-distr/src/main/scripts/runAE.bat rename to uimaj-2.2.1-incubating/uimaj-distr/src/main/scripts/runAE.bat
diff --git a/uimaj-2.2.1-06/uimaj-distr/src/main/scripts/runAE.sh b/uimaj-2.2.1-incubating/uimaj-distr/src/main/scripts/runAE.sh similarity index 100% rename from uimaj-2.2.1-06/uimaj-distr/src/main/scripts/runAE.sh rename to uimaj-2.2.1-incubating/uimaj-distr/src/main/scripts/runAE.sh
diff --git a/uimaj-2.2.1-06/uimaj-distr/src/main/scripts/runCPE.bat b/uimaj-2.2.1-incubating/uimaj-distr/src/main/scripts/runCPE.bat similarity index 100% rename from uimaj-2.2.1-06/uimaj-distr/src/main/scripts/runCPE.bat rename to uimaj-2.2.1-incubating/uimaj-distr/src/main/scripts/runCPE.bat
diff --git a/uimaj-2.2.1-06/uimaj-distr/src/main/scripts/runCPE.sh b/uimaj-2.2.1-incubating/uimaj-distr/src/main/scripts/runCPE.sh similarity index 100% rename from uimaj-2.2.1-06/uimaj-distr/src/main/scripts/runCPE.sh rename to uimaj-2.2.1-incubating/uimaj-distr/src/main/scripts/runCPE.sh
diff --git a/uimaj-2.2.1-06/uimaj-distr/src/main/scripts/runPearInstaller.bat b/uimaj-2.2.1-incubating/uimaj-distr/src/main/scripts/runPearInstaller.bat similarity index 100% rename from uimaj-2.2.1-06/uimaj-distr/src/main/scripts/runPearInstaller.bat rename to uimaj-2.2.1-incubating/uimaj-distr/src/main/scripts/runPearInstaller.bat
diff --git a/uimaj-2.2.1-06/uimaj-distr/src/main/scripts/runPearInstaller.sh b/uimaj-2.2.1-incubating/uimaj-distr/src/main/scripts/runPearInstaller.sh similarity index 100% rename from uimaj-2.2.1-06/uimaj-distr/src/main/scripts/runPearInstaller.sh rename to uimaj-2.2.1-incubating/uimaj-distr/src/main/scripts/runPearInstaller.sh
diff --git a/uimaj-2.2.1-06/uimaj-distr/src/main/scripts/runPearMerger.bat b/uimaj-2.2.1-incubating/uimaj-distr/src/main/scripts/runPearMerger.bat similarity index 100% rename from uimaj-2.2.1-06/uimaj-distr/src/main/scripts/runPearMerger.bat rename to uimaj-2.2.1-incubating/uimaj-distr/src/main/scripts/runPearMerger.bat
diff --git a/uimaj-2.2.1-06/uimaj-distr/src/main/scripts/runPearMerger.sh b/uimaj-2.2.1-incubating/uimaj-distr/src/main/scripts/runPearMerger.sh similarity index 100% rename from uimaj-2.2.1-06/uimaj-distr/src/main/scripts/runPearMerger.sh rename to uimaj-2.2.1-incubating/uimaj-distr/src/main/scripts/runPearMerger.sh
diff --git a/uimaj-2.2.1-06/uimaj-distr/src/main/scripts/runPearPackager.bat b/uimaj-2.2.1-incubating/uimaj-distr/src/main/scripts/runPearPackager.bat similarity index 100% rename from uimaj-2.2.1-06/uimaj-distr/src/main/scripts/runPearPackager.bat rename to uimaj-2.2.1-incubating/uimaj-distr/src/main/scripts/runPearPackager.bat
diff --git a/uimaj-2.2.1-06/uimaj-distr/src/main/scripts/runPearPackager.sh b/uimaj-2.2.1-incubating/uimaj-distr/src/main/scripts/runPearPackager.sh similarity index 100% rename from uimaj-2.2.1-06/uimaj-distr/src/main/scripts/runPearPackager.sh rename to uimaj-2.2.1-incubating/uimaj-distr/src/main/scripts/runPearPackager.sh
diff --git a/uimaj-2.2.1-06/uimaj-distr/src/main/scripts/setUimaClassPath.bat b/uimaj-2.2.1-incubating/uimaj-distr/src/main/scripts/setUimaClassPath.bat similarity index 100% rename from uimaj-2.2.1-06/uimaj-distr/src/main/scripts/setUimaClassPath.bat rename to uimaj-2.2.1-incubating/uimaj-distr/src/main/scripts/setUimaClassPath.bat
diff --git a/uimaj-2.2.1-06/uimaj-distr/src/main/scripts/setUimaClassPath.sh b/uimaj-2.2.1-incubating/uimaj-distr/src/main/scripts/setUimaClassPath.sh similarity index 100% rename from uimaj-2.2.1-06/uimaj-distr/src/main/scripts/setUimaClassPath.sh rename to uimaj-2.2.1-incubating/uimaj-distr/src/main/scripts/setUimaClassPath.sh
diff --git a/uimaj-2.2.1-06/uimaj-distr/src/main/scripts/startVNS.bat b/uimaj-2.2.1-incubating/uimaj-distr/src/main/scripts/startVNS.bat similarity index 100% rename from uimaj-2.2.1-06/uimaj-distr/src/main/scripts/startVNS.bat rename to uimaj-2.2.1-incubating/uimaj-distr/src/main/scripts/startVNS.bat
diff --git a/uimaj-2.2.1-06/uimaj-distr/src/main/scripts/startVNS.sh b/uimaj-2.2.1-incubating/uimaj-distr/src/main/scripts/startVNS.sh similarity index 100% rename from uimaj-2.2.1-06/uimaj-distr/src/main/scripts/startVNS.sh rename to uimaj-2.2.1-incubating/uimaj-distr/src/main/scripts/startVNS.sh
diff --git a/uimaj-2.2.1-06/uimaj-distr/src/main/scripts/startVinciService.bat b/uimaj-2.2.1-incubating/uimaj-distr/src/main/scripts/startVinciService.bat similarity index 100% rename from uimaj-2.2.1-06/uimaj-distr/src/main/scripts/startVinciService.bat rename to uimaj-2.2.1-incubating/uimaj-distr/src/main/scripts/startVinciService.bat
diff --git a/uimaj-2.2.1-06/uimaj-distr/src/main/scripts/startVinciService.sh b/uimaj-2.2.1-incubating/uimaj-distr/src/main/scripts/startVinciService.sh similarity index 100% rename from uimaj-2.2.1-06/uimaj-distr/src/main/scripts/startVinciService.sh rename to uimaj-2.2.1-incubating/uimaj-distr/src/main/scripts/startVinciService.sh
diff --git a/uimaj-2.2.1-06/uimaj-distr/src/main/scripts/validateDescriptor.bat b/uimaj-2.2.1-incubating/uimaj-distr/src/main/scripts/validateDescriptor.bat similarity index 100% rename from uimaj-2.2.1-06/uimaj-distr/src/main/scripts/validateDescriptor.bat rename to uimaj-2.2.1-incubating/uimaj-distr/src/main/scripts/validateDescriptor.bat
diff --git a/uimaj-2.2.1-06/uimaj-distr/src/main/scripts/validateDescriptor.sh b/uimaj-2.2.1-incubating/uimaj-distr/src/main/scripts/validateDescriptor.sh similarity index 100% rename from uimaj-2.2.1-06/uimaj-distr/src/main/scripts/validateDescriptor.sh rename to uimaj-2.2.1-incubating/uimaj-distr/src/main/scripts/validateDescriptor.sh
diff --git a/uimaj-2.2.1-06/uimaj-document-annotation/pom.xml b/uimaj-2.2.1-incubating/uimaj-document-annotation/pom.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-document-annotation/pom.xml rename to uimaj-2.2.1-incubating/uimaj-document-annotation/pom.xml
diff --git a/uimaj-2.2.1-06/uimaj-document-annotation/src/main/java/org/apache/uima/jcas/tcas/DocumentAnnotation.java b/uimaj-2.2.1-incubating/uimaj-document-annotation/src/main/java/org/apache/uima/jcas/tcas/DocumentAnnotation.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-document-annotation/src/main/java/org/apache/uima/jcas/tcas/DocumentAnnotation.java rename to uimaj-2.2.1-incubating/uimaj-document-annotation/src/main/java/org/apache/uima/jcas/tcas/DocumentAnnotation.java
diff --git a/uimaj-2.2.1-06/uimaj-document-annotation/src/main/java/org/apache/uima/jcas/tcas/DocumentAnnotation_Type.java b/uimaj-2.2.1-incubating/uimaj-document-annotation/src/main/java/org/apache/uima/jcas/tcas/DocumentAnnotation_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-document-annotation/src/main/java/org/apache/uima/jcas/tcas/DocumentAnnotation_Type.java rename to uimaj-2.2.1-incubating/uimaj-document-annotation/src/main/java/org/apache/uima/jcas/tcas/DocumentAnnotation_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-document-annotation/src/test/java/org/apache/uima/jcas/tcas/DocumentAnnotationTest.java b/uimaj-2.2.1-incubating/uimaj-document-annotation/src/test/java/org/apache/uima/jcas/tcas/DocumentAnnotationTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-document-annotation/src/test/java/org/apache/uima/jcas/tcas/DocumentAnnotationTest.java rename to uimaj-2.2.1-incubating/uimaj-document-annotation/src/test/java/org/apache/uima/jcas/tcas/DocumentAnnotationTest.java
diff --git a/uimaj-2.2.1-06/uimaj-eclipse-feature-runtime/.project b/uimaj-2.2.1-incubating/uimaj-eclipse-feature-runtime/.project similarity index 100% rename from uimaj-2.2.1-06/uimaj-eclipse-feature-runtime/.project rename to uimaj-2.2.1-incubating/uimaj-eclipse-feature-runtime/.project
diff --git a/uimaj-2.2.1-06/uimaj-eclipse-feature-runtime/build.properties b/uimaj-2.2.1-incubating/uimaj-eclipse-feature-runtime/build.properties similarity index 100% rename from uimaj-2.2.1-06/uimaj-eclipse-feature-runtime/build.properties rename to uimaj-2.2.1-incubating/uimaj-eclipse-feature-runtime/build.properties
diff --git a/uimaj-2.2.1-06/uimaj-eclipse-feature-runtime/feature.xml b/uimaj-2.2.1-incubating/uimaj-eclipse-feature-runtime/feature.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-eclipse-feature-runtime/feature.xml rename to uimaj-2.2.1-incubating/uimaj-eclipse-feature-runtime/feature.xml
diff --git a/uimaj-2.2.1-06/uimaj-eclipse-feature-tools/.project b/uimaj-2.2.1-incubating/uimaj-eclipse-feature-tools/.project similarity index 100% rename from uimaj-2.2.1-06/uimaj-eclipse-feature-tools/.project rename to uimaj-2.2.1-incubating/uimaj-eclipse-feature-tools/.project
diff --git a/uimaj-2.2.1-06/uimaj-eclipse-feature-tools/build.properties b/uimaj-2.2.1-incubating/uimaj-eclipse-feature-tools/build.properties similarity index 100% rename from uimaj-2.2.1-06/uimaj-eclipse-feature-tools/build.properties rename to uimaj-2.2.1-incubating/uimaj-eclipse-feature-tools/build.properties
diff --git a/uimaj-2.2.1-06/uimaj-eclipse-feature-tools/feature.xml b/uimaj-2.2.1-incubating/uimaj-eclipse-feature-tools/feature.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-eclipse-feature-tools/feature.xml rename to uimaj-2.2.1-incubating/uimaj-eclipse-feature-tools/feature.xml
diff --git a/uimaj-2.2.1-06/uimaj-eclipse-update-site/.project b/uimaj-2.2.1-incubating/uimaj-eclipse-update-site/.project similarity index 100% rename from uimaj-2.2.1-06/uimaj-eclipse-update-site/.project rename to uimaj-2.2.1-incubating/uimaj-eclipse-update-site/.project
diff --git a/uimaj-2.2.1-06/uimaj-eclipse-update-site/build.xml b/uimaj-2.2.1-incubating/uimaj-eclipse-update-site/build.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-eclipse-update-site/build.xml rename to uimaj-2.2.1-incubating/uimaj-eclipse-update-site/build.xml
diff --git a/uimaj-2.2.1-06/uimaj-eclipse-update-site/index.html b/uimaj-2.2.1-incubating/uimaj-eclipse-update-site/index.html similarity index 100% rename from uimaj-2.2.1-06/uimaj-eclipse-update-site/index.html rename to uimaj-2.2.1-incubating/uimaj-eclipse-update-site/index.html
diff --git a/uimaj-2.2.1-06/uimaj-eclipse-update-site/site.xml b/uimaj-2.2.1-incubating/uimaj-eclipse-update-site/site.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-eclipse-update-site/site.xml rename to uimaj-2.2.1-incubating/uimaj-eclipse-update-site/site.xml
diff --git a/uimaj-2.2.1-06/uimaj-eclipse-update-site/web/site.css b/uimaj-2.2.1-incubating/uimaj-eclipse-update-site/web/site.css similarity index 100% rename from uimaj-2.2.1-06/uimaj-eclipse-update-site/web/site.css rename to uimaj-2.2.1-incubating/uimaj-eclipse-update-site/web/site.css
diff --git a/uimaj-2.2.1-06/uimaj-eclipse-update-site/web/site.xsl b/uimaj-2.2.1-incubating/uimaj-eclipse-update-site/web/site.xsl similarity index 100% rename from uimaj-2.2.1-06/uimaj-eclipse-update-site/web/site.xsl rename to uimaj-2.2.1-incubating/uimaj-eclipse-update-site/web/site.xsl
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/META-INF/MANIFEST.MF b/uimaj-2.2.1-incubating/uimaj-ep-configurator/META-INF/MANIFEST.MF similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/META-INF/MANIFEST.MF rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/META-INF/MANIFEST.MF
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/icons/annotator.gif b/uimaj-2.2.1-incubating/uimaj-ep-configurator/icons/annotator.gif similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/icons/annotator.gif rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/icons/annotator.gif Binary files differ
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/icons/arrows.gif b/uimaj-2.2.1-incubating/uimaj-ep-configurator/icons/arrows.gif similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/icons/arrows.gif rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/icons/arrows.gif Binary files differ
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/icons/big_ae.gif b/uimaj-2.2.1-incubating/uimaj-ep-configurator/icons/big_ae.gif similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/icons/big_ae.gif rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/icons/big_ae.gif Binary files differ
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/icons/big_t_s.gif b/uimaj-2.2.1-incubating/uimaj-ep-configurator/icons/big_t_s.gif similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/icons/big_t_s.gif rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/icons/big_t_s.gif Binary files differ
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/icons/blank.GIF b/uimaj-2.2.1-incubating/uimaj-ep-configurator/icons/blank.GIF similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/icons/blank.GIF rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/icons/blank.GIF Binary files differ
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/icons/common.gif b/uimaj-2.2.1-incubating/uimaj-ep-configurator/icons/common.gif similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/icons/common.gif rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/icons/common.gif Binary files differ
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/icons/editor.gif b/uimaj-2.2.1-incubating/uimaj-ep-configurator/icons/editor.gif similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/icons/editor.gif rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/icons/editor.gif Binary files differ
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/icons/form_banner.gif b/uimaj-2.2.1-incubating/uimaj-ep-configurator/icons/form_banner.gif similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/icons/form_banner.gif rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/icons/form_banner.gif Binary files differ
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/icons/gelb.gif b/uimaj-2.2.1-incubating/uimaj-ep-configurator/icons/gelb.gif similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/icons/gelb.gif rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/icons/gelb.gif Binary files differ
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/icons/group.GIF b/uimaj-2.2.1-incubating/uimaj-ep-configurator/icons/group.GIF similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/icons/group.GIF rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/icons/group.GIF Binary files differ
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/icons/one_arrow.gif b/uimaj-2.2.1-incubating/uimaj-ep-configurator/icons/one_arrow.gif similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/icons/one_arrow.gif rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/icons/one_arrow.gif Binary files differ
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/icons/parameter.GIF b/uimaj-2.2.1-incubating/uimaj-ep-configurator/icons/parameter.GIF similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/icons/parameter.GIF rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/icons/parameter.GIF Binary files differ
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/icons/t_s.gif b/uimaj-2.2.1-incubating/uimaj-ep-configurator/icons/t_s.gif similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/icons/t_s.gif rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/icons/t_s.gif Binary files differ
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/icons/th_horizontal.gif b/uimaj-2.2.1-incubating/uimaj-ep-configurator/icons/th_horizontal.gif similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/icons/th_horizontal.gif rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/icons/th_horizontal.gif Binary files differ
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/icons/th_vertical.gif b/uimaj-2.2.1-incubating/uimaj-ep-configurator/icons/th_vertical.gif similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/icons/th_vertical.gif rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/icons/th_vertical.gif Binary files differ
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/plugin.xml b/uimaj-2.2.1-incubating/uimaj-ep-configurator/plugin.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/plugin.xml rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/plugin.xml
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/pom.xml b/uimaj-2.2.1-incubating/uimaj-ep-configurator/pom.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/pom.xml rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/pom.xml
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/schema/editorContribution.exsd b/uimaj-2.2.1-incubating/uimaj-ep-configurator/schema/editorContribution.exsd similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/schema/editorContribution.exsd rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/schema/editorContribution.exsd
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/assembly/assemble-plugin.xml b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/assembly/assemble-plugin.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/assembly/assemble-plugin.xml rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/assembly/assemble-plugin.xml
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/CDEpropertyPage.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/CDEpropertyPage.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/CDEpropertyPage.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/CDEpropertyPage.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/InternalErrorCDE.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/InternalErrorCDE.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/InternalErrorCDE.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/InternalErrorCDE.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/Messages.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/Messages.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/Messages.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/Messages.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/PreferencePage.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/PreferencePage.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/PreferencePage.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/PreferencePage.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/StandardStrings.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/StandardStrings.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/StandardStrings.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/StandardStrings.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/TAEConfiguratorPlugin.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/TAEConfiguratorPlugin.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/TAEConfiguratorPlugin.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/TAEConfiguratorPlugin.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/Form2Panel.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/Form2Panel.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/Form2Panel.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/Form2Panel.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/MultiPageEditor.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/MultiPageEditor.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/MultiPageEditor.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/MultiPageEditor.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/MultiPageEditorContributor.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/MultiPageEditorContributor.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/MultiPageEditorContributor.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/MultiPageEditorContributor.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/point/IUimaEditorExtension.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/point/IUimaEditorExtension.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/point/IUimaEditorExtension.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/point/IUimaEditorExtension.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/point/IUimaMultiPageEditor.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/point/IUimaMultiPageEditor.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/point/IUimaMultiPageEditor.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/point/IUimaMultiPageEditor.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/AbstractImportablePartSection.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/AbstractImportablePartSection.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/AbstractImportablePartSection.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/AbstractImportablePartSection.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/AbstractSection.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/AbstractSection.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/AbstractSection.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/AbstractSection.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/AbstractSectionParm.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/AbstractSectionParm.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/AbstractSectionParm.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/AbstractSectionParm.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/AggregatePage.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/AggregatePage.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/AggregatePage.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/AggregatePage.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/AggregateSection.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/AggregateSection.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/AggregateSection.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/AggregateSection.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/CapabilityPage.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/CapabilityPage.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/CapabilityPage.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/CapabilityPage.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/CapabilitySection.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/CapabilitySection.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/CapabilitySection.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/CapabilitySection.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/ExtnlResBindSection.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/ExtnlResBindSection.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/ExtnlResBindSection.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/ExtnlResBindSection.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/FileAndShortName.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/FileAndShortName.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/FileAndShortName.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/FileAndShortName.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/FlowSection.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/FlowSection.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/FlowSection.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/FlowSection.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/GeneralSection.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/GeneralSection.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/GeneralSection.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/GeneralSection.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/HeaderPage.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/HeaderPage.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/HeaderPage.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/HeaderPage.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/HeaderPageWithSash.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/HeaderPageWithSash.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/HeaderPageWithSash.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/HeaderPageWithSash.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/ImportResBindSection.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/ImportResBindSection.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/ImportResBindSection.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/ImportResBindSection.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/ImportSection.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/ImportSection.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/ImportSection.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/ImportSection.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/IndexImportSection.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/IndexImportSection.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/IndexImportSection.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/IndexImportSection.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/IndexSection.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/IndexSection.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/IndexSection.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/IndexSection.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/IndexesPage.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/IndexesPage.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/IndexesPage.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/IndexesPage.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/MetaDataSection.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/MetaDataSection.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/MetaDataSection.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/MetaDataSection.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/OverviewPage.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/OverviewPage.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/OverviewPage.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/OverviewPage.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/ParameterDelegatesSection.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/ParameterDelegatesSection.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/ParameterDelegatesSection.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/ParameterDelegatesSection.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/ParameterPage.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/ParameterPage.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/ParameterPage.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/ParameterPage.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/ParameterSection.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/ParameterSection.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/ParameterSection.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/ParameterSection.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/ParameterSettingsSection.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/ParameterSettingsSection.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/ParameterSettingsSection.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/ParameterSettingsSection.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/PrimitiveSection.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/PrimitiveSection.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/PrimitiveSection.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/PrimitiveSection.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/PriorityListSection.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/PriorityListSection.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/PriorityListSection.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/PriorityListSection.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/ResourceDependencySection.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/ResourceDependencySection.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/ResourceDependencySection.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/ResourceDependencySection.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/ResourcesPage.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/ResourcesPage.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/ResourcesPage.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/ResourcesPage.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/SettingsPage.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/SettingsPage.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/SettingsPage.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/SettingsPage.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/SofaMapSection.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/SofaMapSection.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/SofaMapSection.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/SofaMapSection.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/TypeImportSection.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/TypeImportSection.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/TypeImportSection.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/TypeImportSection.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/TypePage.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/TypePage.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/TypePage.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/TypePage.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/TypePriorityImportSection.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/TypePriorityImportSection.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/TypePriorityImportSection.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/TypePriorityImportSection.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/TypeSection.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/TypeSection.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/TypeSection.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/TypeSection.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/Utility.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/Utility.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/Utility.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/Utility.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/ValueSection.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/ValueSection.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/ValueSection.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/ValueSection.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AbstractDialog.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AbstractDialog.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AbstractDialog.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AbstractDialog.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AbstractDialogKeyVerify.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AbstractDialogKeyVerify.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AbstractDialogKeyVerify.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AbstractDialogKeyVerify.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AbstractDialogKeyVerifyJavaNames.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AbstractDialogKeyVerifyJavaNames.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AbstractDialogKeyVerifyJavaNames.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AbstractDialogKeyVerifyJavaNames.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AbstractDialogMultiColTable.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AbstractDialogMultiColTable.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AbstractDialogMultiColTable.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AbstractDialogMultiColTable.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AddAllowedValueDialog.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AddAllowedValueDialog.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AddAllowedValueDialog.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AddAllowedValueDialog.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AddCapabilityFeatureDialog.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AddCapabilityFeatureDialog.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AddCapabilityFeatureDialog.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AddCapabilityFeatureDialog.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AddCapabilityTypeDialog.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AddCapabilityTypeDialog.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AddCapabilityTypeDialog.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AddCapabilityTypeDialog.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AddExternalResourceDependencyDialog.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AddExternalResourceDependencyDialog.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AddExternalResourceDependencyDialog.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AddExternalResourceDependencyDialog.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AddExternalResourceDialog.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AddExternalResourceDialog.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AddExternalResourceDialog.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AddExternalResourceDialog.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AddFeatureDialog.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AddFeatureDialog.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AddFeatureDialog.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AddFeatureDialog.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AddIndexDialog.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AddIndexDialog.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AddIndexDialog.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AddIndexDialog.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AddIndexKeyDialog.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AddIndexKeyDialog.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AddIndexKeyDialog.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AddIndexKeyDialog.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AddParameterDialog.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AddParameterDialog.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AddParameterDialog.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AddParameterDialog.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AddRemoteServiceDialog.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AddRemoteServiceDialog.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AddRemoteServiceDialog.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AddRemoteServiceDialog.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AddSofaDialog.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AddSofaDialog.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AddSofaDialog.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AddSofaDialog.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AddTypeDialog.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AddTypeDialog.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AddTypeDialog.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AddTypeDialog.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AddTypeToPriorityListDialog.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AddTypeToPriorityListDialog.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AddTypeToPriorityListDialog.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AddTypeToPriorityListDialog.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/CommonInputDialog.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/CommonInputDialog.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/CommonInputDialog.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/CommonInputDialog.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/ContentAssistField32.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/ContentAssistField32.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/ContentAssistField32.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/ContentAssistField32.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/EditSofaBindingsDialog.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/EditSofaBindingsDialog.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/EditSofaBindingsDialog.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/EditSofaBindingsDialog.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/ExportImportablePartDialog.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/ExportImportablePartDialog.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/ExportImportablePartDialog.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/ExportImportablePartDialog.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/FindComponentDialog.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/FindComponentDialog.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/FindComponentDialog.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/FindComponentDialog.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/PickTaeForTypesDialog.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/PickTaeForTypesDialog.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/PickTaeForTypesDialog.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/PickTaeForTypesDialog.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/ResourcePickerDialog.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/ResourcePickerDialog.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/ResourcePickerDialog.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/ResourcePickerDialog.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/SearchMonitoringThread.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/SearchMonitoringThread.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/SearchMonitoringThread.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/SearchMonitoringThread.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/SearchThread.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/SearchThread.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/SearchThread.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/SearchThread.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/SelectTypeDialog.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/SelectTypeDialog.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/SelectTypeDialog.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/SelectTypeDialog.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/TypesWithNameSpaces.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/TypesWithNameSpaces.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/TypesWithNameSpaces.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/TypesWithNameSpaces.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/TypesWithNameSpaces32.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/TypesWithNameSpaces32.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/TypesWithNameSpaces32.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/TypesWithNameSpaces32.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/xml/ColorManager.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/xml/ColorManager.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/xml/ColorManager.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/xml/ColorManager.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/xml/IXMLColorConstants.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/xml/IXMLColorConstants.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/xml/IXMLColorConstants.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/xml/IXMLColorConstants.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/xml/NonRuleBasedDamagerRepairer.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/xml/NonRuleBasedDamagerRepairer.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/xml/NonRuleBasedDamagerRepairer.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/xml/NonRuleBasedDamagerRepairer.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/xml/TagRule.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/xml/TagRule.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/xml/TagRule.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/xml/TagRule.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/xml/XMLConfiguration.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/xml/XMLConfiguration.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/xml/XMLConfiguration.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/xml/XMLConfiguration.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/xml/XMLDocumentProvider.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/xml/XMLDocumentProvider.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/xml/XMLDocumentProvider.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/xml/XMLDocumentProvider.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/xml/XMLDoubleClickStrategy.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/xml/XMLDoubleClickStrategy.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/xml/XMLDoubleClickStrategy.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/xml/XMLDoubleClickStrategy.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/xml/XMLEditor.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/xml/XMLEditor.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/xml/XMLEditor.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/xml/XMLEditor.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/xml/XMLPartitionScanner.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/xml/XMLPartitionScanner.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/xml/XMLPartitionScanner.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/xml/XMLPartitionScanner.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/xml/XMLScanner.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/xml/XMLScanner.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/xml/XMLScanner.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/xml/XMLScanner.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/xml/XMLTagScanner.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/xml/XMLTagScanner.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/xml/XMLTagScanner.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/xml/XMLTagScanner.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/xml/XMLWhitespaceDetector.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/xml/XMLWhitespaceDetector.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/xml/XMLWhitespaceDetector.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/xml/XMLWhitespaceDetector.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/files/ContextForPartDialog.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/files/ContextForPartDialog.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/files/ContextForPartDialog.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/files/ContextForPartDialog.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/files/MultiResourceSelectionDialog.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/files/MultiResourceSelectionDialog.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/files/MultiResourceSelectionDialog.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/files/MultiResourceSelectionDialog.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/files/MultiResourceSelectionDialogWithFlowOption.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/files/MultiResourceSelectionDialogWithFlowOption.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/files/MultiResourceSelectionDialogWithFlowOption.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/files/MultiResourceSelectionDialogWithFlowOption.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/files/PickOverrideKeysAndParmName.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/files/PickOverrideKeysAndParmName.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/files/PickOverrideKeysAndParmName.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/files/PickOverrideKeysAndParmName.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/model/AbstractModelPart.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/model/AbstractModelPart.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/model/AbstractModelPart.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/model/AbstractModelPart.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/model/AllTypes.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/model/AllTypes.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/model/AllTypes.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/model/AllTypes.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/model/BuiltInTypes.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/model/BuiltInTypes.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/model/BuiltInTypes.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/model/BuiltInTypes.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/model/ConfigGroup.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/model/ConfigGroup.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/model/ConfigGroup.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/model/ConfigGroup.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/model/DefinedTypesWithSupers.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/model/DefinedTypesWithSupers.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/model/DefinedTypesWithSupers.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/model/DefinedTypesWithSupers.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/model/DescriptorMetaData.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/model/DescriptorMetaData.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/model/DescriptorMetaData.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/model/DescriptorMetaData.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/model/DescriptorTCAS.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/model/DescriptorTCAS.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/model/DescriptorTCAS.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/model/DescriptorTCAS.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/model/FlowNodes.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/model/FlowNodes.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/model/FlowNodes.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/model/FlowNodes.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/wizards/AbstractNewWizard.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/wizards/AbstractNewWizard.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/wizards/AbstractNewWizard.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/wizards/AbstractNewWizard.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/wizards/AbstractNewWizardPage.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/wizards/AbstractNewWizardPage.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/wizards/AbstractNewWizardPage.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/wizards/AbstractNewWizardPage.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/wizards/CasConsumerNewWizard.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/wizards/CasConsumerNewWizard.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/wizards/CasConsumerNewWizard.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/wizards/CasConsumerNewWizard.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/wizards/CasConsumerNewWizardPage.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/wizards/CasConsumerNewWizardPage.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/wizards/CasConsumerNewWizardPage.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/wizards/CasConsumerNewWizardPage.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/wizards/CasInitializerNewWizard.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/wizards/CasInitializerNewWizard.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/wizards/CasInitializerNewWizard.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/wizards/CasInitializerNewWizard.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/wizards/CasInitializerNewWizardPage.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/wizards/CasInitializerNewWizardPage.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/wizards/CasInitializerNewWizardPage.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/wizards/CasInitializerNewWizardPage.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/wizards/CollectionReaderNewWizard.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/wizards/CollectionReaderNewWizard.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/wizards/CollectionReaderNewWizard.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/wizards/CollectionReaderNewWizard.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/wizards/CollectionReaderNewWizardPage.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/wizards/CollectionReaderNewWizardPage.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/wizards/CollectionReaderNewWizardPage.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/wizards/CollectionReaderNewWizardPage.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/wizards/FlowControllerNewWizard.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/wizards/FlowControllerNewWizard.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/wizards/FlowControllerNewWizard.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/wizards/FlowControllerNewWizard.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/wizards/FlowControllerNewWizardPage.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/wizards/FlowControllerNewWizardPage.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/wizards/FlowControllerNewWizardPage.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/wizards/FlowControllerNewWizardPage.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/wizards/FsIndexCollectionNewWizard.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/wizards/FsIndexCollectionNewWizard.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/wizards/FsIndexCollectionNewWizard.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/wizards/FsIndexCollectionNewWizard.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/wizards/FsIndexCollectionNewWizardPage.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/wizards/FsIndexCollectionNewWizardPage.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/wizards/FsIndexCollectionNewWizardPage.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/wizards/FsIndexCollectionNewWizardPage.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/wizards/ResourceManagerConfigurationNewWizard.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/wizards/ResourceManagerConfigurationNewWizard.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/wizards/ResourceManagerConfigurationNewWizard.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/wizards/ResourceManagerConfigurationNewWizard.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/wizards/ResourceManagerConfigurationNewWizardPage.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/wizards/ResourceManagerConfigurationNewWizardPage.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/wizards/ResourceManagerConfigurationNewWizardPage.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/wizards/ResourceManagerConfigurationNewWizardPage.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/wizards/TAEConfiguratorNewWizard.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/wizards/TAEConfiguratorNewWizard.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/wizards/TAEConfiguratorNewWizard.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/wizards/TAEConfiguratorNewWizard.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/wizards/TAEConfiguratorNewWizardPage.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/wizards/TAEConfiguratorNewWizardPage.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/wizards/TAEConfiguratorNewWizardPage.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/wizards/TAEConfiguratorNewWizardPage.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/wizards/TypePrioritiesNewWizard.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/wizards/TypePrioritiesNewWizard.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/wizards/TypePrioritiesNewWizard.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/wizards/TypePrioritiesNewWizard.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/wizards/TypePrioritiesNewWizardPage.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/wizards/TypePrioritiesNewWizardPage.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/wizards/TypePrioritiesNewWizardPage.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/wizards/TypePrioritiesNewWizardPage.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/wizards/TypeSystemNewWizard.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/wizards/TypeSystemNewWizard.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/wizards/TypeSystemNewWizard.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/wizards/TypeSystemNewWizard.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/wizards/TypeSystemNewWizardPage.java b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/wizards/TypeSystemNewWizardPage.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/wizards/TypeSystemNewWizardPage.java rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/wizards/TypeSystemNewWizardPage.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-configurator/src/main/resources/org/apache/uima/taeconfigurator/messages.properties b/uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/resources/org/apache/uima/taeconfigurator/messages.properties similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-configurator/src/main/resources/org/apache/uima/taeconfigurator/messages.properties rename to uimaj-2.2.1-incubating/uimaj-ep-configurator/src/main/resources/org/apache/uima/taeconfigurator/messages.properties
diff --git a/uimaj-2.2.1-06/uimaj-ep-debug/META-INF/MANIFEST.MF b/uimaj-2.2.1-incubating/uimaj-ep-debug/META-INF/MANIFEST.MF similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-debug/META-INF/MANIFEST.MF rename to uimaj-2.2.1-incubating/uimaj-ep-debug/META-INF/MANIFEST.MF
diff --git a/uimaj-2.2.1-06/uimaj-ep-debug/plugin.xml b/uimaj-2.2.1-incubating/uimaj-ep-debug/plugin.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-debug/plugin.xml rename to uimaj-2.2.1-incubating/uimaj-ep-debug/plugin.xml
diff --git a/uimaj-2.2.1-06/uimaj-ep-debug/pom.xml b/uimaj-2.2.1-incubating/uimaj-ep-debug/pom.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-debug/pom.xml rename to uimaj-2.2.1-incubating/uimaj-ep-debug/pom.xml
diff --git a/uimaj-2.2.1-06/uimaj-ep-debug/src/main/assembly/assemble-plugin.xml b/uimaj-2.2.1-incubating/uimaj-ep-debug/src/main/assembly/assemble-plugin.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-debug/src/main/assembly/assemble-plugin.xml rename to uimaj-2.2.1-incubating/uimaj-ep-debug/src/main/assembly/assemble-plugin.xml
diff --git a/uimaj-2.2.1-06/uimaj-ep-debug/src/main/java/org/apache/uima/ep_debug/DebugPlugin.java b/uimaj-2.2.1-incubating/uimaj-ep-debug/src/main/java/org/apache/uima/ep_debug/DebugPlugin.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-debug/src/main/java/org/apache/uima/ep_debug/DebugPlugin.java rename to uimaj-2.2.1-incubating/uimaj-ep-debug/src/main/java/org/apache/uima/ep_debug/DebugPlugin.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-jcasgen/META-INF/MANIFEST.MF b/uimaj-2.2.1-incubating/uimaj-ep-jcasgen/META-INF/MANIFEST.MF similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-jcasgen/META-INF/MANIFEST.MF rename to uimaj-2.2.1-incubating/uimaj-ep-jcasgen/META-INF/MANIFEST.MF
diff --git a/uimaj-2.2.1-06/uimaj-ep-jcasgen/plugin.xml b/uimaj-2.2.1-incubating/uimaj-ep-jcasgen/plugin.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-jcasgen/plugin.xml rename to uimaj-2.2.1-incubating/uimaj-ep-jcasgen/plugin.xml
diff --git a/uimaj-2.2.1-06/uimaj-ep-jcasgen/pom.xml b/uimaj-2.2.1-incubating/uimaj-ep-jcasgen/pom.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-jcasgen/pom.xml rename to uimaj-2.2.1-incubating/uimaj-ep-jcasgen/pom.xml
diff --git a/uimaj-2.2.1-06/uimaj-ep-jcasgen/src/main/assembly/assemble-plugin.xml b/uimaj-2.2.1-incubating/uimaj-ep-jcasgen/src/main/assembly/assemble-plugin.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-jcasgen/src/main/assembly/assemble-plugin.xml rename to uimaj-2.2.1-incubating/uimaj-ep-jcasgen/src/main/assembly/assemble-plugin.xml
diff --git a/uimaj-2.2.1-06/uimaj-ep-jcasgen/src/main/java/org/apache/uima/jcas/jcasgenp/EP_LogThrowErrorImpl.java b/uimaj-2.2.1-incubating/uimaj-ep-jcasgen/src/main/java/org/apache/uima/jcas/jcasgenp/EP_LogThrowErrorImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-jcasgen/src/main/java/org/apache/uima/jcas/jcasgenp/EP_LogThrowErrorImpl.java rename to uimaj-2.2.1-incubating/uimaj-ep-jcasgen/src/main/java/org/apache/uima/jcas/jcasgenp/EP_LogThrowErrorImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-jcasgen/src/main/java/org/apache/uima/jcas/jcasgenp/JgPlugin.java b/uimaj-2.2.1-incubating/uimaj-ep-jcasgen/src/main/java/org/apache/uima/jcas/jcasgenp/JgPlugin.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-jcasgen/src/main/java/org/apache/uima/jcas/jcasgenp/JgPlugin.java rename to uimaj-2.2.1-incubating/uimaj-ep-jcasgen/src/main/java/org/apache/uima/jcas/jcasgenp/JgPlugin.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-jcasgen/src/main/java/org/apache/uima/jcas/jcasgenp/JgPluginRunner.java b/uimaj-2.2.1-incubating/uimaj-ep-jcasgen/src/main/java/org/apache/uima/jcas/jcasgenp/JgPluginRunner.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-jcasgen/src/main/java/org/apache/uima/jcas/jcasgenp/JgPluginRunner.java rename to uimaj-2.2.1-incubating/uimaj-ep-jcasgen/src/main/java/org/apache/uima/jcas/jcasgenp/JgPluginRunner.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-jcasgen/src/main/java/org/apache/uima/jcas/jcasgenp/MergerImpl.java b/uimaj-2.2.1-incubating/uimaj-ep-jcasgen/src/main/java/org/apache/uima/jcas/jcasgenp/MergerImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-jcasgen/src/main/java/org/apache/uima/jcas/jcasgenp/MergerImpl.java rename to uimaj-2.2.1-incubating/uimaj-ep-jcasgen/src/main/java/org/apache/uima/jcas/jcasgenp/MergerImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-jcasgen/src/main/java/org/apache/uima/jcas/jcasgenp/ProgressMonitorImpl.java b/uimaj-2.2.1-incubating/uimaj-ep-jcasgen/src/main/java/org/apache/uima/jcas/jcasgenp/ProgressMonitorImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-jcasgen/src/main/java/org/apache/uima/jcas/jcasgenp/ProgressMonitorImpl.java rename to uimaj-2.2.1-incubating/uimaj-ep-jcasgen/src/main/java/org/apache/uima/jcas/jcasgenp/ProgressMonitorImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-pear-packager/META-INF/MANIFEST.MF b/uimaj-2.2.1-incubating/uimaj-ep-pear-packager/META-INF/MANIFEST.MF similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-pear-packager/META-INF/MANIFEST.MF rename to uimaj-2.2.1-incubating/uimaj-ep-pear-packager/META-INF/MANIFEST.MF
diff --git a/uimaj-2.2.1-06/uimaj-ep-pear-packager/about.html b/uimaj-2.2.1-incubating/uimaj-ep-pear-packager/about.html similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-pear-packager/about.html rename to uimaj-2.2.1-incubating/uimaj-ep-pear-packager/about.html
diff --git a/uimaj-2.2.1-06/uimaj-ep-pear-packager/icons/editInsdIcon.gif b/uimaj-2.2.1-incubating/uimaj-ep-pear-packager/icons/editInsdIcon.gif similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-pear-packager/icons/editInsdIcon.gif rename to uimaj-2.2.1-incubating/uimaj-ep-pear-packager/icons/editInsdIcon.gif Binary files differ
diff --git a/uimaj-2.2.1-06/uimaj-ep-pear-packager/icons/editInsdWiz.gif b/uimaj-2.2.1-incubating/uimaj-ep-pear-packager/icons/editInsdWiz.gif similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-pear-packager/icons/editInsdWiz.gif rename to uimaj-2.2.1-incubating/uimaj-ep-pear-packager/icons/editInsdWiz.gif Binary files differ
diff --git a/uimaj-2.2.1-06/uimaj-ep-pear-packager/icons/generatePearIcon.gif b/uimaj-2.2.1-incubating/uimaj-ep-pear-packager/icons/generatePearIcon.gif similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-pear-packager/icons/generatePearIcon.gif rename to uimaj-2.2.1-incubating/uimaj-ep-pear-packager/icons/generatePearIcon.gif Binary files differ
diff --git a/uimaj-2.2.1-06/uimaj-ep-pear-packager/icons/generatePearWiz.gif b/uimaj-2.2.1-incubating/uimaj-ep-pear-packager/icons/generatePearWiz.gif similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-pear-packager/icons/generatePearWiz.gif rename to uimaj-2.2.1-incubating/uimaj-ep-pear-packager/icons/generatePearWiz.gif Binary files differ
diff --git a/uimaj-2.2.1-06/uimaj-ep-pear-packager/icons/tae.gif b/uimaj-2.2.1-incubating/uimaj-ep-pear-packager/icons/tae.gif similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-pear-packager/icons/tae.gif rename to uimaj-2.2.1-incubating/uimaj-ep-pear-packager/icons/tae.gif Binary files differ
diff --git a/uimaj-2.2.1-06/uimaj-ep-pear-packager/icons/uimaNatureIcon.gif b/uimaj-2.2.1-incubating/uimaj-ep-pear-packager/icons/uimaNatureIcon.gif similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-pear-packager/icons/uimaNatureIcon.gif rename to uimaj-2.2.1-incubating/uimaj-ep-pear-packager/icons/uimaNatureIcon.gif Binary files differ
diff --git a/uimaj-2.2.1-06/uimaj-ep-pear-packager/icons/uimaProjectIcon.gif b/uimaj-2.2.1-incubating/uimaj-ep-pear-packager/icons/uimaProjectIcon.gif similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-pear-packager/icons/uimaProjectIcon.gif rename to uimaj-2.2.1-incubating/uimaj-ep-pear-packager/icons/uimaProjectIcon.gif Binary files differ
diff --git a/uimaj-2.2.1-06/uimaj-ep-pear-packager/icons/uimaProjectWiz.gif b/uimaj-2.2.1-incubating/uimaj-ep-pear-packager/icons/uimaProjectWiz.gif similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-pear-packager/icons/uimaProjectWiz.gif rename to uimaj-2.2.1-incubating/uimaj-ep-pear-packager/icons/uimaProjectWiz.gif Binary files differ
diff --git a/uimaj-2.2.1-06/uimaj-ep-pear-packager/plugin.xml b/uimaj-2.2.1-incubating/uimaj-ep-pear-packager/plugin.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-pear-packager/plugin.xml rename to uimaj-2.2.1-incubating/uimaj-ep-pear-packager/plugin.xml
diff --git a/uimaj-2.2.1-06/uimaj-ep-pear-packager/pom.xml b/uimaj-2.2.1-incubating/uimaj-ep-pear-packager/pom.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-pear-packager/pom.xml rename to uimaj-2.2.1-incubating/uimaj-ep-pear-packager/pom.xml
diff --git a/uimaj-2.2.1-06/uimaj-ep-pear-packager/src/main/assembly/assemble-plugin.xml b/uimaj-2.2.1-incubating/uimaj-ep-pear-packager/src/main/assembly/assemble-plugin.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-pear-packager/src/main/assembly/assemble-plugin.xml rename to uimaj-2.2.1-incubating/uimaj-ep-pear-packager/src/main/assembly/assemble-plugin.xml
diff --git a/uimaj-2.2.1-06/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/PearException.java b/uimaj-2.2.1-incubating/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/PearException.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/PearException.java rename to uimaj-2.2.1-incubating/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/PearException.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/PearPlugin.java b/uimaj-2.2.1-incubating/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/PearPlugin.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/PearPlugin.java rename to uimaj-2.2.1-incubating/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/PearPlugin.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/actions/AddUimaNatureAction.java b/uimaj-2.2.1-incubating/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/actions/AddUimaNatureAction.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/actions/AddUimaNatureAction.java rename to uimaj-2.2.1-incubating/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/actions/AddUimaNatureAction.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/actions/EditInstallationDescriptorAction.java b/uimaj-2.2.1-incubating/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/actions/EditInstallationDescriptorAction.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/actions/EditInstallationDescriptorAction.java rename to uimaj-2.2.1-incubating/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/actions/EditInstallationDescriptorAction.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/actions/GeneratePearFileAction.java b/uimaj-2.2.1-incubating/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/actions/GeneratePearFileAction.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/actions/GeneratePearFileAction.java rename to uimaj-2.2.1-incubating/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/actions/GeneratePearFileAction.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/actions/PearProjectCustomizationException.java b/uimaj-2.2.1-incubating/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/actions/PearProjectCustomizationException.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/actions/PearProjectCustomizationException.java rename to uimaj-2.2.1-incubating/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/actions/PearProjectCustomizationException.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/generate/GeneratePearWizard.java b/uimaj-2.2.1-incubating/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/generate/GeneratePearWizard.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/generate/GeneratePearWizard.java rename to uimaj-2.2.1-incubating/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/generate/GeneratePearWizard.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/generate/PearExport.java b/uimaj-2.2.1-incubating/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/generate/PearExport.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/generate/PearExport.java rename to uimaj-2.2.1-incubating/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/generate/PearExport.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/generate/PearExportMessages.java b/uimaj-2.2.1-incubating/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/generate/PearExportMessages.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/generate/PearExportMessages.java rename to uimaj-2.2.1-incubating/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/generate/PearExportMessages.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/generate/PearExportOperation.java b/uimaj-2.2.1-incubating/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/generate/PearExportOperation.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/generate/PearExportOperation.java rename to uimaj-2.2.1-incubating/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/generate/PearExportOperation.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/generate/PearFileResourceExportPage.java b/uimaj-2.2.1-incubating/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/generate/PearFileResourceExportPage.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/generate/PearFileResourceExportPage.java rename to uimaj-2.2.1-incubating/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/generate/PearFileResourceExportPage.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/generate/package.html b/uimaj-2.2.1-incubating/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/generate/package.html similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/generate/package.html rename to uimaj-2.2.1-incubating/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/generate/package.html
diff --git a/uimaj-2.2.1-06/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/EditInstallationDescriptorWizard.java b/uimaj-2.2.1-incubating/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/EditInstallationDescriptorWizard.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/EditInstallationDescriptorWizard.java rename to uimaj-2.2.1-incubating/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/EditInstallationDescriptorWizard.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/INSDComponentPage.java b/uimaj-2.2.1-incubating/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/INSDComponentPage.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/INSDComponentPage.java rename to uimaj-2.2.1-incubating/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/INSDComponentPage.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/INSDEnvironmentPage.java b/uimaj-2.2.1-incubating/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/INSDEnvironmentPage.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/INSDEnvironmentPage.java rename to uimaj-2.2.1-incubating/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/INSDEnvironmentPage.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/InsdConstants.java b/uimaj-2.2.1-incubating/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/InsdConstants.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/InsdConstants.java rename to uimaj-2.2.1-incubating/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/InsdConstants.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/PearInstallationDescriptor.java b/uimaj-2.2.1-incubating/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/PearInstallationDescriptor.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/PearInstallationDescriptor.java rename to uimaj-2.2.1-incubating/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/PearInstallationDescriptor.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/package.html b/uimaj-2.2.1-incubating/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/package.html similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/package.html rename to uimaj-2.2.1-incubating/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/package.html
diff --git a/uimaj-2.2.1-06/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/vars/AbstractVarValViewerHandler.java b/uimaj-2.2.1-incubating/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/vars/AbstractVarValViewerHandler.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/vars/AbstractVarValViewerHandler.java rename to uimaj-2.2.1-incubating/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/vars/AbstractVarValViewerHandler.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/vars/IVarValListViewer.java b/uimaj-2.2.1-incubating/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/vars/IVarValListViewer.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/vars/IVarValListViewer.java rename to uimaj-2.2.1-incubating/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/vars/IVarValListViewer.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/vars/VarVal.java b/uimaj-2.2.1-incubating/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/vars/VarVal.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/vars/VarVal.java rename to uimaj-2.2.1-incubating/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/vars/VarVal.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/vars/VarValCellModifier.java b/uimaj-2.2.1-incubating/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/vars/VarValCellModifier.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/vars/VarValCellModifier.java rename to uimaj-2.2.1-incubating/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/vars/VarValCellModifier.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/vars/VarValLabelProvider.java b/uimaj-2.2.1-incubating/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/vars/VarValLabelProvider.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/vars/VarValLabelProvider.java rename to uimaj-2.2.1-incubating/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/vars/VarValLabelProvider.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/vars/VarValList.java b/uimaj-2.2.1-incubating/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/vars/VarValList.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/vars/VarValList.java rename to uimaj-2.2.1-incubating/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/vars/VarValList.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/vars/VarValSorter.java b/uimaj-2.2.1-incubating/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/vars/VarValSorter.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/vars/VarValSorter.java rename to uimaj-2.2.1-incubating/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/vars/VarValSorter.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/vars/VarValViewerHandler.java b/uimaj-2.2.1-incubating/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/vars/VarValViewerHandler.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/vars/VarValViewerHandler.java rename to uimaj-2.2.1-incubating/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/vars/VarValViewerHandler.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/vars/package.html b/uimaj-2.2.1-incubating/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/vars/package.html similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/vars/package.html rename to uimaj-2.2.1-incubating/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/vars/package.html
diff --git a/uimaj-2.2.1-06/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/nature/ProjectCustomizer.java b/uimaj-2.2.1-incubating/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/nature/ProjectCustomizer.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/nature/ProjectCustomizer.java rename to uimaj-2.2.1-incubating/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/nature/ProjectCustomizer.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/nature/UimaNature.java b/uimaj-2.2.1-incubating/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/nature/UimaNature.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/nature/UimaNature.java rename to uimaj-2.2.1-incubating/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/nature/UimaNature.java
diff --git a/uimaj-2.2.1-06/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/nature/package.html b/uimaj-2.2.1-incubating/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/nature/package.html similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/nature/package.html rename to uimaj-2.2.1-incubating/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/nature/package.html
diff --git a/uimaj-2.2.1-06/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/package.html b/uimaj-2.2.1-incubating/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/package.html similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/package.html rename to uimaj-2.2.1-incubating/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/package.html
diff --git a/uimaj-2.2.1-06/uimaj-ep-pear-packager/src/main/resources/org/apache/uima/pear/generate/messages.properties b/uimaj-2.2.1-incubating/uimaj-ep-pear-packager/src/main/resources/org/apache/uima/pear/generate/messages.properties similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-pear-packager/src/main/resources/org/apache/uima/pear/generate/messages.properties rename to uimaj-2.2.1-incubating/uimaj-ep-pear-packager/src/main/resources/org/apache/uima/pear/generate/messages.properties
diff --git a/uimaj-2.2.1-06/uimaj-ep-runtime/META-INF/MANIFEST.MF b/uimaj-2.2.1-incubating/uimaj-ep-runtime/META-INF/MANIFEST.MF similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-runtime/META-INF/MANIFEST.MF rename to uimaj-2.2.1-incubating/uimaj-ep-runtime/META-INF/MANIFEST.MF
diff --git a/uimaj-2.2.1-06/uimaj-ep-runtime/plugin.xml b/uimaj-2.2.1-incubating/uimaj-ep-runtime/plugin.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-runtime/plugin.xml rename to uimaj-2.2.1-incubating/uimaj-ep-runtime/plugin.xml
diff --git a/uimaj-2.2.1-06/uimaj-ep-runtime/pom.xml b/uimaj-2.2.1-incubating/uimaj-ep-runtime/pom.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-runtime/pom.xml rename to uimaj-2.2.1-incubating/uimaj-ep-runtime/pom.xml
diff --git a/uimaj-2.2.1-06/uimaj-ep-runtime/src/main/assembly/assemble-plugin.xml b/uimaj-2.2.1-incubating/uimaj-ep-runtime/src/main/assembly/assemble-plugin.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-ep-runtime/src/main/assembly/assemble-plugin.xml rename to uimaj-2.2.1-incubating/uimaj-ep-runtime/src/main/assembly/assemble-plugin.xml
diff --git a/uimaj-2.2.1-06/uimaj-examples/pom.xml b/uimaj-2.2.1-incubating/uimaj-examples/pom.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/pom.xml rename to uimaj-2.2.1-incubating/uimaj-examples/pom.xml
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/data/Apache_UIMA.txt b/uimaj-2.2.1-incubating/uimaj-examples/src/main/data/Apache_UIMA.txt similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/data/Apache_UIMA.txt rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/data/Apache_UIMA.txt
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/data/IBM_LifeSciences.txt b/uimaj-2.2.1-incubating/uimaj-examples/src/main/data/IBM_LifeSciences.txt similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/data/IBM_LifeSciences.txt rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/data/IBM_LifeSciences.txt
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/data/New_IBM_Fellows.txt b/uimaj-2.2.1-incubating/uimaj-examples/src/main/data/New_IBM_Fellows.txt similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/data/New_IBM_Fellows.txt rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/data/New_IBM_Fellows.txt
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/data/SeminarChallengesInSpeechRecognition.txt b/uimaj-2.2.1-incubating/uimaj-examples/src/main/data/SeminarChallengesInSpeechRecognition.txt similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/data/SeminarChallengesInSpeechRecognition.txt rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/data/SeminarChallengesInSpeechRecognition.txt
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/data/TrainableInformationExtractionSystems.txt b/uimaj-2.2.1-incubating/uimaj-examples/src/main/data/TrainableInformationExtractionSystems.txt similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/data/TrainableInformationExtractionSystems.txt rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/data/TrainableInformationExtractionSystems.txt
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/data/UIMASummerSchool2003.txt b/uimaj-2.2.1-incubating/uimaj-examples/src/main/data/UIMASummerSchool2003.txt similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/data/UIMASummerSchool2003.txt rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/data/UIMASummerSchool2003.txt
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/data/UIMA_Seminars.txt b/uimaj-2.2.1-incubating/uimaj-examples/src/main/data/UIMA_Seminars.txt similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/data/UIMA_Seminars.txt rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/data/UIMA_Seminars.txt
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/data/WatsonConferenceRooms.txt b/uimaj-2.2.1-incubating/uimaj-examples/src/main/data/WatsonConferenceRooms.txt similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/data/WatsonConferenceRooms.txt rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/data/WatsonConferenceRooms.txt
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/data/xml/IBM_LifeSciences.xml b/uimaj-2.2.1-incubating/uimaj-examples/src/main/data/xml/IBM_LifeSciences.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/data/xml/IBM_LifeSciences.xml rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/data/xml/IBM_LifeSciences.xml
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/data/xml/New_IBM_Fellows.xml b/uimaj-2.2.1-incubating/uimaj-examples/src/main/data/xml/New_IBM_Fellows.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/data/xml/New_IBM_Fellows.xml rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/data/xml/New_IBM_Fellows.xml
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/data/xml/SeminarChallengesInSpeechRecognition.xml b/uimaj-2.2.1-incubating/uimaj-examples/src/main/data/xml/SeminarChallengesInSpeechRecognition.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/data/xml/SeminarChallengesInSpeechRecognition.xml rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/data/xml/SeminarChallengesInSpeechRecognition.xml
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/data/xml/TrainableInformationExtractionSystems.xml b/uimaj-2.2.1-incubating/uimaj-examples/src/main/data/xml/TrainableInformationExtractionSystems.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/data/xml/TrainableInformationExtractionSystems.xml rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/data/xml/TrainableInformationExtractionSystems.xml
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/data/xml/UIMASummerSchool2003.xml b/uimaj-2.2.1-incubating/uimaj-examples/src/main/data/xml/UIMASummerSchool2003.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/data/xml/UIMASummerSchool2003.xml rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/data/xml/UIMASummerSchool2003.xml
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/data/xml/UIMA_Seminars.xml b/uimaj-2.2.1-incubating/uimaj-examples/src/main/data/xml/UIMA_Seminars.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/data/xml/UIMA_Seminars.xml rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/data/xml/UIMA_Seminars.xml
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/data/xml/WatsonConferenceRooms.xml b/uimaj-2.2.1-incubating/uimaj-examples/src/main/data/xml/WatsonConferenceRooms.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/data/xml/WatsonConferenceRooms.xml rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/data/xml/WatsonConferenceRooms.xml
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/deploy/soap/Deploy_GovernmentTitleRecognizer.wsdd b/uimaj-2.2.1-incubating/uimaj-examples/src/main/deploy/soap/Deploy_GovernmentTitleRecognizer.wsdd similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/deploy/soap/Deploy_GovernmentTitleRecognizer.wsdd rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/deploy/soap/Deploy_GovernmentTitleRecognizer.wsdd
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/deploy/soap/Deploy_NamesAndPersonTitles.wsdd b/uimaj-2.2.1-incubating/uimaj-examples/src/main/deploy/soap/Deploy_NamesAndPersonTitles.wsdd similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/deploy/soap/Deploy_NamesAndPersonTitles.wsdd rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/deploy/soap/Deploy_NamesAndPersonTitles.wsdd
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/deploy/soap/Deploy_PersonTitleAnnotator.wsdd b/uimaj-2.2.1-incubating/uimaj-examples/src/main/deploy/soap/Deploy_PersonTitleAnnotator.wsdd similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/deploy/soap/Deploy_PersonTitleAnnotator.wsdd rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/deploy/soap/Deploy_PersonTitleAnnotator.wsdd
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/deploy/soap/Deploy_SimpleNameRecognizer.wsdd b/uimaj-2.2.1-incubating/uimaj-examples/src/main/deploy/soap/Deploy_SimpleNameRecognizer.wsdd similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/deploy/soap/Deploy_SimpleNameRecognizer.wsdd rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/deploy/soap/Deploy_SimpleNameRecognizer.wsdd
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/deploy/soap/Undeploy_GovernmentTitleRecognizer.wsdd b/uimaj-2.2.1-incubating/uimaj-examples/src/main/deploy/soap/Undeploy_GovernmentTitleRecognizer.wsdd similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/deploy/soap/Undeploy_GovernmentTitleRecognizer.wsdd rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/deploy/soap/Undeploy_GovernmentTitleRecognizer.wsdd
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/deploy/soap/Undeploy_NamesAndPersonTitles.wsdd b/uimaj-2.2.1-incubating/uimaj-examples/src/main/deploy/soap/Undeploy_NamesAndPersonTitles.wsdd similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/deploy/soap/Undeploy_NamesAndPersonTitles.wsdd rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/deploy/soap/Undeploy_NamesAndPersonTitles.wsdd
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/deploy/soap/Undeploy_PersonTitleAnnotator.wsdd b/uimaj-2.2.1-incubating/uimaj-examples/src/main/deploy/soap/Undeploy_PersonTitleAnnotator.wsdd similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/deploy/soap/Undeploy_PersonTitleAnnotator.wsdd rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/deploy/soap/Undeploy_PersonTitleAnnotator.wsdd
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/deploy/soap/Undeploy_SimpleNameRecognizer.wsdd b/uimaj-2.2.1-incubating/uimaj-examples/src/main/deploy/soap/Undeploy_SimpleNameRecognizer.wsdd similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/deploy/soap/Undeploy_SimpleNameRecognizer.wsdd rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/deploy/soap/Undeploy_SimpleNameRecognizer.wsdd
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/deploy/vinci/Deploy_MeetingDetectorTAE.xml b/uimaj-2.2.1-incubating/uimaj-examples/src/main/deploy/vinci/Deploy_MeetingDetectorTAE.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/deploy/vinci/Deploy_MeetingDetectorTAE.xml rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/deploy/vinci/Deploy_MeetingDetectorTAE.xml
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/deploy/vinci/Deploy_PersonTitleAnnotator.xml b/uimaj-2.2.1-incubating/uimaj-examples/src/main/deploy/vinci/Deploy_PersonTitleAnnotator.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/deploy/vinci/Deploy_PersonTitleAnnotator.xml rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/deploy/vinci/Deploy_PersonTitleAnnotator.xml
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/deploy/vinci/Deploy_XmiWriterWithTutorialTypeSystem.xml b/uimaj-2.2.1-incubating/uimaj-examples/src/main/deploy/vinci/Deploy_XmiWriterWithTutorialTypeSystem.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/deploy/vinci/Deploy_XmiWriterWithTutorialTypeSystem.xml rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/deploy/vinci/Deploy_XmiWriterWithTutorialTypeSystem.xml
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/MixedAggregate.xml b/uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/MixedAggregate.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/MixedAggregate.xml rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/MixedAggregate.xml
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/analysis_engine/GovernmentOfficialRecognizer_RegEx_TAE.xml b/uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/analysis_engine/GovernmentOfficialRecognizer_RegEx_TAE.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/analysis_engine/GovernmentOfficialRecognizer_RegEx_TAE.xml rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/analysis_engine/GovernmentOfficialRecognizer_RegEx_TAE.xml
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/analysis_engine/NamesAndGovernmentOfficials_TAE.xml b/uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/analysis_engine/NamesAndGovernmentOfficials_TAE.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/analysis_engine/NamesAndGovernmentOfficials_TAE.xml rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/analysis_engine/NamesAndGovernmentOfficials_TAE.xml
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/analysis_engine/NamesAndPersonTitles_TAE.xml b/uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/analysis_engine/NamesAndPersonTitles_TAE.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/analysis_engine/NamesAndPersonTitles_TAE.xml rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/analysis_engine/NamesAndPersonTitles_TAE.xml
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/analysis_engine/PersonTitleAnnotator.xml b/uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/analysis_engine/PersonTitleAnnotator.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/analysis_engine/PersonTitleAnnotator.xml rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/analysis_engine/PersonTitleAnnotator.xml
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/analysis_engine/PersonTitleAnnotator_WithinNamesOnly.xml b/uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/analysis_engine/PersonTitleAnnotator_WithinNamesOnly.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/analysis_engine/PersonTitleAnnotator_WithinNamesOnly.xml rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/analysis_engine/PersonTitleAnnotator_WithinNamesOnly.xml
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/analysis_engine/RegExAnnotator.xml b/uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/analysis_engine/RegExAnnotator.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/analysis_engine/RegExAnnotator.xml rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/analysis_engine/RegExAnnotator.xml
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/analysis_engine/SimpleEmailRecognizer_RegEx_TAE.xml b/uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/analysis_engine/SimpleEmailRecognizer_RegEx_TAE.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/analysis_engine/SimpleEmailRecognizer_RegEx_TAE.xml rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/analysis_engine/SimpleEmailRecognizer_RegEx_TAE.xml
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/analysis_engine/SimpleNameRecognizer_RegEx_TAE.xml b/uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/analysis_engine/SimpleNameRecognizer_RegEx_TAE.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/analysis_engine/SimpleNameRecognizer_RegEx_TAE.xml rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/analysis_engine/SimpleNameRecognizer_RegEx_TAE.xml
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/analysis_engine/SimpleTokenAndSentenceAnnotator.xml b/uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/analysis_engine/SimpleTokenAndSentenceAnnotator.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/analysis_engine/SimpleTokenAndSentenceAnnotator.xml rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/analysis_engine/SimpleTokenAndSentenceAnnotator.xml
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/analysis_engine/SofaExampleAnnotator.xml b/uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/analysis_engine/SofaExampleAnnotator.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/analysis_engine/SofaExampleAnnotator.xml rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/analysis_engine/SofaExampleAnnotator.xml
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/analysis_engine/UIMA_Analysis_Example.xml b/uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/analysis_engine/UIMA_Analysis_Example.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/analysis_engine/UIMA_Analysis_Example.xml rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/analysis_engine/UIMA_Analysis_Example.xml
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/analysis_engine/XmlDetagger.xml b/uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/analysis_engine/XmlDetagger.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/analysis_engine/XmlDetagger.xml rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/analysis_engine/XmlDetagger.xml
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/cas_consumer/AnnotationPrinter.xml b/uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/cas_consumer/AnnotationPrinter.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/cas_consumer/AnnotationPrinter.xml rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/cas_consumer/AnnotationPrinter.xml
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/cas_consumer/InlineXmlCasConsumer.xml b/uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/cas_consumer/InlineXmlCasConsumer.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/cas_consumer/InlineXmlCasConsumer.xml rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/cas_consumer/InlineXmlCasConsumer.xml
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/cas_consumer/XCasWriterCasConsumer.xml b/uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/cas_consumer/XCasWriterCasConsumer.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/cas_consumer/XCasWriterCasConsumer.xml rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/cas_consumer/XCasWriterCasConsumer.xml
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/cas_consumer/XmiEcoreCasConsumer.xml b/uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/cas_consumer/XmiEcoreCasConsumer.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/cas_consumer/XmiEcoreCasConsumer.xml rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/cas_consumer/XmiEcoreCasConsumer.xml
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/cas_consumer/XmiWriterCasConsumer.xml b/uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/cas_consumer/XmiWriterCasConsumer.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/cas_consumer/XmiWriterCasConsumer.xml rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/cas_consumer/XmiWriterCasConsumer.xml
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/cas_consumer/XmiWriterWithTutorialTypeSystem.xml b/uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/cas_consumer/XmiWriterWithTutorialTypeSystem.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/cas_consumer/XmiWriterWithTutorialTypeSystem.xml rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/cas_consumer/XmiWriterWithTutorialTypeSystem.xml
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/cas_multiplier/Segment_Annotate_Merge_AE.xml b/uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/cas_multiplier/Segment_Annotate_Merge_AE.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/cas_multiplier/Segment_Annotate_Merge_AE.xml rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/cas_multiplier/Segment_Annotate_Merge_AE.xml
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/cas_multiplier/SegmenterAndTokenizerAE.xml b/uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/cas_multiplier/SegmenterAndTokenizerAE.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/cas_multiplier/SegmenterAndTokenizerAE.xml rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/cas_multiplier/SegmenterAndTokenizerAE.xml
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/cas_multiplier/SimpleTextMerger.xml b/uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/cas_multiplier/SimpleTextMerger.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/cas_multiplier/SimpleTextMerger.xml rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/cas_multiplier/SimpleTextMerger.xml
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/cas_multiplier/SimpleTextSegmenter.xml b/uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/cas_multiplier/SimpleTextSegmenter.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/cas_multiplier/SimpleTextSegmenter.xml rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/cas_multiplier/SimpleTextSegmenter.xml
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/collection_processing_engine/MeetingFinderCPE_Integrated.xml b/uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/collection_processing_engine/MeetingFinderCPE_Integrated.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/collection_processing_engine/MeetingFinderCPE_Integrated.xml rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/collection_processing_engine/MeetingFinderCPE_Integrated.xml
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/collection_processing_engine/MeetingFinderCPE_Managed_Unix.xml b/uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/collection_processing_engine/MeetingFinderCPE_Managed_Unix.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/collection_processing_engine/MeetingFinderCPE_Managed_Unix.xml rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/collection_processing_engine/MeetingFinderCPE_Managed_Unix.xml
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/collection_processing_engine/MeetingFinderCPE_Managed_Windows.xml b/uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/collection_processing_engine/MeetingFinderCPE_Managed_Windows.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/collection_processing_engine/MeetingFinderCPE_Managed_Windows.xml rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/collection_processing_engine/MeetingFinderCPE_Managed_Windows.xml
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/collection_processing_engine/MeetingFinderCPE_NonManaged.xml b/uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/collection_processing_engine/MeetingFinderCPE_NonManaged.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/collection_processing_engine/MeetingFinderCPE_NonManaged.xml rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/collection_processing_engine/MeetingFinderCPE_NonManaged.xml
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/collection_processing_engine/MeetingFinderCPE_NonManagedCasConsumer.xml b/uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/collection_processing_engine/MeetingFinderCPE_NonManagedCasConsumer.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/collection_processing_engine/MeetingFinderCPE_NonManagedCasConsumer.xml rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/collection_processing_engine/MeetingFinderCPE_NonManagedCasConsumer.xml
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/collection_processing_engine/MeetingFinderCPE_WithXmlDetagging.xml b/uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/collection_processing_engine/MeetingFinderCPE_WithXmlDetagging.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/collection_processing_engine/MeetingFinderCPE_WithXmlDetagging.xml rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/collection_processing_engine/MeetingFinderCPE_WithXmlDetagging.xml
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/collection_reader/FileSystemCollectionReader.xml b/uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/collection_reader/FileSystemCollectionReader.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/collection_reader/FileSystemCollectionReader.xml rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/collection_reader/FileSystemCollectionReader.xml
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/collection_reader/XmiCollectionReader.xml b/uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/collection_reader/XmiCollectionReader.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/collection_reader/XmiCollectionReader.xml rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/collection_reader/XmiCollectionReader.xml
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/flow_controller/AdvancedFixedFlowController.xml b/uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/flow_controller/AdvancedFixedFlowController.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/flow_controller/AdvancedFixedFlowController.xml rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/flow_controller/AdvancedFixedFlowController.xml
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/flow_controller/MeetingDetectorTAE_AdvancedFixedFlow.xml b/uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/flow_controller/MeetingDetectorTAE_AdvancedFixedFlow.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/flow_controller/MeetingDetectorTAE_AdvancedFixedFlow.xml rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/flow_controller/MeetingDetectorTAE_AdvancedFixedFlow.xml
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/flow_controller/MeetingDetectorTAE_Whiteboard.xml b/uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/flow_controller/MeetingDetectorTAE_Whiteboard.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/flow_controller/MeetingDetectorTAE_Whiteboard.xml rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/flow_controller/MeetingDetectorTAE_Whiteboard.xml
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/flow_controller/WhiteboardFlowController.xml b/uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/flow_controller/WhiteboardFlowController.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/flow_controller/WhiteboardFlowController.xml rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/flow_controller/WhiteboardFlowController.xml
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/soapService/GovernmentTitleRecognizerService.xml b/uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/soapService/GovernmentTitleRecognizerService.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/soapService/GovernmentTitleRecognizerService.xml rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/soapService/GovernmentTitleRecognizerService.xml
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/soapService/NamesAndPersonTitlesService.xml b/uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/soapService/NamesAndPersonTitlesService.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/soapService/NamesAndPersonTitlesService.xml rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/soapService/NamesAndPersonTitlesService.xml
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/soapService/PersonTitleAnnotatorService.xml b/uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/soapService/PersonTitleAnnotatorService.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/soapService/PersonTitleAnnotatorService.xml rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/soapService/PersonTitleAnnotatorService.xml
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/soapService/SimpleNameRecognizerService.xml b/uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/soapService/SimpleNameRecognizerService.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/soapService/SimpleNameRecognizerService.xml rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/soapService/SimpleNameRecognizerService.xml
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/tutorial/ex1/RoomNumberAnnotator.xml b/uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/tutorial/ex1/RoomNumberAnnotator.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/tutorial/ex1/RoomNumberAnnotator.xml rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/tutorial/ex1/RoomNumberAnnotator.xml
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/tutorial/ex1/TutorialTypeSystem.xml b/uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/tutorial/ex1/TutorialTypeSystem.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/tutorial/ex1/TutorialTypeSystem.xml rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/tutorial/ex1/TutorialTypeSystem.xml
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/tutorial/ex2/RoomNumberAnnotator.xml b/uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/tutorial/ex2/RoomNumberAnnotator.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/tutorial/ex2/RoomNumberAnnotator.xml rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/tutorial/ex2/RoomNumberAnnotator.xml
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/tutorial/ex3/RoomNumberAndDateTime.xml b/uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/tutorial/ex3/RoomNumberAndDateTime.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/tutorial/ex3/RoomNumberAndDateTime.xml rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/tutorial/ex3/RoomNumberAndDateTime.xml
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/tutorial/ex3/TutorialDateTime.xml b/uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/tutorial/ex3/TutorialDateTime.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/tutorial/ex3/TutorialDateTime.xml rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/tutorial/ex3/TutorialDateTime.xml
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/tutorial/ex3/TutorialTypeSystem.xml b/uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/tutorial/ex3/TutorialTypeSystem.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/tutorial/ex3/TutorialTypeSystem.xml rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/tutorial/ex3/TutorialTypeSystem.xml
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/tutorial/ex4/MeetingAnnotator.xml b/uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/tutorial/ex4/MeetingAnnotator.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/tutorial/ex4/MeetingAnnotator.xml rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/tutorial/ex4/MeetingAnnotator.xml
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/tutorial/ex4/MeetingDetectorTAE.xml b/uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/tutorial/ex4/MeetingDetectorTAE.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/tutorial/ex4/MeetingDetectorTAE.xml rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/tutorial/ex4/MeetingDetectorTAE.xml
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/tutorial/ex4/TutorialTypeSystem.xml b/uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/tutorial/ex4/TutorialTypeSystem.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/tutorial/ex4/TutorialTypeSystem.xml rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/tutorial/ex4/TutorialTypeSystem.xml
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/tutorial/ex5/RoomNumberAnnotator.xml b/uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/tutorial/ex5/RoomNumberAnnotator.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/tutorial/ex5/RoomNumberAnnotator.xml rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/tutorial/ex5/RoomNumberAnnotator.xml
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/tutorial/ex6/TutorialTypeSystem.xml b/uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/tutorial/ex6/TutorialTypeSystem.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/tutorial/ex6/TutorialTypeSystem.xml rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/tutorial/ex6/TutorialTypeSystem.xml
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/tutorial/ex6/UimaAcronymAnnotator.xml b/uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/tutorial/ex6/UimaAcronymAnnotator.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/tutorial/ex6/UimaAcronymAnnotator.xml rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/tutorial/ex6/UimaAcronymAnnotator.xml
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/tutorial/ex6/UimaMeetingAnnotator.xml b/uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/tutorial/ex6/UimaMeetingAnnotator.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/tutorial/ex6/UimaMeetingAnnotator.xml rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/tutorial/ex6/UimaMeetingAnnotator.xml
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/tutorial/ex6/UimaMeetingDetectorTAE.xml b/uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/tutorial/ex6/UimaMeetingDetectorTAE.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/tutorial/ex6/UimaMeetingDetectorTAE.xml rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/tutorial/ex6/UimaMeetingDetectorTAE.xml
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/tutorial/search/MeetingIndexBuildSpec.xml b/uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/tutorial/search/MeetingIndexBuildSpec.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/tutorial/search/MeetingIndexBuildSpec.xml rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/tutorial/search/MeetingIndexBuildSpec.xml
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/vinciService/MeetingDetectorVinciService.xml b/uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/vinciService/MeetingDetectorVinciService.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/vinciService/MeetingDetectorVinciService.xml rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/vinciService/MeetingDetectorVinciService.xml
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/vinciService/PersonTitleVinciService.xml b/uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/vinciService/PersonTitleVinciService.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/vinciService/PersonTitleVinciService.xml rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/vinciService/PersonTitleVinciService.xml
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/vinciService/XmiWriterVinciServiceWithTutorialTypeSystem.xml b/uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/vinciService/XmiWriterVinciServiceWithTutorialTypeSystem.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/descriptors/vinciService/XmiWriterVinciServiceWithTutorialTypeSystem.xml rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/descriptors/vinciService/XmiWriterVinciServiceWithTutorialTypeSystem.xml
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/eclipseProject/classpath b/uimaj-2.2.1-incubating/uimaj-examples/src/main/eclipseProject/classpath similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/eclipseProject/classpath rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/eclipseProject/classpath
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/eclipseProject/ecore_src_readme.txt b/uimaj-2.2.1-incubating/uimaj-examples/src/main/eclipseProject/ecore_src_readme.txt similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/eclipseProject/ecore_src_readme.txt rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/eclipseProject/ecore_src_readme.txt
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/eclipseProject/project b/uimaj-2.2.1-incubating/uimaj-examples/src/main/eclipseProject/project similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/eclipseProject/project rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/eclipseProject/project
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/eclipseProject/readme.txt b/uimaj-2.2.1-incubating/uimaj-examples/src/main/eclipseProject/readme.txt similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/eclipseProject/readme.txt rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/eclipseProject/readme.txt
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/java/example/PersonTitle.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/java/example/PersonTitle.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/java/example/PersonTitle.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/java/example/PersonTitle.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/java/example/PersonTitle_Type.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/java/example/PersonTitle_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/java/example/PersonTitle_Type.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/java/example/PersonTitle_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/examples/ExampleApplication.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/examples/ExampleApplication.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/examples/ExampleApplication.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/examples/ExampleApplication.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/examples/PrintAnnotations.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/examples/PrintAnnotations.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/examples/PrintAnnotations.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/examples/PrintAnnotations.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/examples/RunAE.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/examples/RunAE.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/examples/RunAE.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/examples/RunAE.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/examples/SofaExampleAnnotator.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/examples/SofaExampleAnnotator.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/examples/SofaExampleAnnotator.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/examples/SofaExampleAnnotator.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/examples/SofaExampleApplication.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/examples/SofaExampleApplication.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/examples/SofaExampleApplication.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/examples/SofaExampleApplication.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/examples/SourceDocumentInformation.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/examples/SourceDocumentInformation.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/examples/SourceDocumentInformation.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/examples/SourceDocumentInformation.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/examples/SourceDocumentInformation_Type.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/examples/SourceDocumentInformation_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/examples/SourceDocumentInformation_Type.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/examples/SourceDocumentInformation_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/examples/XmlDetagger.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/examples/XmlDetagger.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/examples/XmlDetagger.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/examples/XmlDetagger.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/examples/cas/PersonTitleAnnotator.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/examples/cas/PersonTitleAnnotator.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/examples/cas/PersonTitleAnnotator.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/examples/cas/PersonTitleAnnotator.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/examples/cas/RegExAnnotator.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/examples/cas/RegExAnnotator.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/examples/cas/RegExAnnotator.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/examples/cas/RegExAnnotator.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/examples/cas/package.html b/uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/examples/cas/package.html similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/examples/cas/package.html rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/examples/cas/package.html
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/examples/casMultiplier/CasMultiplierExampleApplication.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/examples/casMultiplier/CasMultiplierExampleApplication.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/examples/casMultiplier/CasMultiplierExampleApplication.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/examples/casMultiplier/CasMultiplierExampleApplication.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/examples/casMultiplier/SimpleTextMerger.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/examples/casMultiplier/SimpleTextMerger.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/examples/casMultiplier/SimpleTextMerger.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/examples/casMultiplier/SimpleTextMerger.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/examples/casMultiplier/SimpleTextSegmenter.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/examples/casMultiplier/SimpleTextSegmenter.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/examples/casMultiplier/SimpleTextSegmenter.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/examples/casMultiplier/SimpleTextSegmenter.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/examples/cpe/AnnotationPrinter.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/examples/cpe/AnnotationPrinter.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/examples/cpe/AnnotationPrinter.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/examples/cpe/AnnotationPrinter.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/examples/cpe/FileSystemCollectionReader.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/examples/cpe/FileSystemCollectionReader.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/examples/cpe/FileSystemCollectionReader.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/examples/cpe/FileSystemCollectionReader.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/examples/cpe/InlineXmlCasConsumer.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/examples/cpe/InlineXmlCasConsumer.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/examples/cpe/InlineXmlCasConsumer.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/examples/cpe/InlineXmlCasConsumer.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/examples/cpe/PersonTitleDBWriterCasConsumer.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/examples/cpe/PersonTitleDBWriterCasConsumer.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/examples/cpe/PersonTitleDBWriterCasConsumer.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/examples/cpe/PersonTitleDBWriterCasConsumer.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/examples/cpe/SimpleRunCPE.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/examples/cpe/SimpleRunCPE.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/examples/cpe/SimpleRunCPE.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/examples/cpe/SimpleRunCPE.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/examples/cpe/SimpleRunCPM.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/examples/cpe/SimpleRunCPM.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/examples/cpe/SimpleRunCPM.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/examples/cpe/SimpleRunCPM.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/examples/cpe/XCasWriterCasConsumer.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/examples/cpe/XCasWriterCasConsumer.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/examples/cpe/XCasWriterCasConsumer.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/examples/cpe/XCasWriterCasConsumer.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/examples/cpe/package.html b/uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/examples/cpe/package.html similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/examples/cpe/package.html rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/examples/cpe/package.html
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/examples/flow/AdvancedFixedFlowController.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/examples/flow/AdvancedFixedFlowController.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/examples/flow/AdvancedFixedFlowController.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/examples/flow/AdvancedFixedFlowController.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/examples/flow/WhiteboardFlowController.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/examples/flow/WhiteboardFlowController.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/examples/flow/WhiteboardFlowController.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/examples/flow/WhiteboardFlowController.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/examples/flow/WhiteboardFlowController2.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/examples/flow/WhiteboardFlowController2.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/examples/flow/WhiteboardFlowController2.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/examples/flow/WhiteboardFlowController2.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/examples/package.html b/uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/examples/package.html similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/examples/package.html rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/examples/package.html
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/examples/tokenizer/Sentence.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/examples/tokenizer/Sentence.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/examples/tokenizer/Sentence.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/examples/tokenizer/Sentence.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/examples/tokenizer/Sentence_Type.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/examples/tokenizer/Sentence_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/examples/tokenizer/Sentence_Type.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/examples/tokenizer/Sentence_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/examples/tokenizer/SimpleTokenAndSentenceAnnotator.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/examples/tokenizer/SimpleTokenAndSentenceAnnotator.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/examples/tokenizer/SimpleTokenAndSentenceAnnotator.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/examples/tokenizer/SimpleTokenAndSentenceAnnotator.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/examples/tokenizer/Token.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/examples/tokenizer/Token.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/examples/tokenizer/Token.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/examples/tokenizer/Token.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/examples/tokenizer/Token_Type.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/examples/tokenizer/Token_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/examples/tokenizer/Token_Type.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/examples/tokenizer/Token_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/examples/xmi/XmiCollectionReader.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/examples/xmi/XmiCollectionReader.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/examples/xmi/XmiCollectionReader.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/examples/xmi/XmiCollectionReader.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/examples/xmi/XmiEcoreCasConsumer.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/examples/xmi/XmiEcoreCasConsumer.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/examples/xmi/XmiEcoreCasConsumer.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/examples/xmi/XmiEcoreCasConsumer.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/examples/xmi/XmiWriterCasConsumer.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/examples/xmi/XmiWriterCasConsumer.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/examples/xmi/XmiWriterCasConsumer.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/examples/xmi/XmiWriterCasConsumer.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/tutorial/DateAnnot.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/tutorial/DateAnnot.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/tutorial/DateAnnot.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/tutorial/DateAnnot.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/tutorial/DateAnnot_Type.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/tutorial/DateAnnot_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/tutorial/DateAnnot_Type.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/tutorial/DateAnnot_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/tutorial/DateTimeAnnot.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/tutorial/DateTimeAnnot.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/tutorial/DateTimeAnnot.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/tutorial/DateTimeAnnot.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/tutorial/DateTimeAnnot_Type.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/tutorial/DateTimeAnnot_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/tutorial/DateTimeAnnot_Type.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/tutorial/DateTimeAnnot_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/tutorial/Meeting.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/tutorial/Meeting.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/tutorial/Meeting.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/tutorial/Meeting.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/tutorial/Meeting_Type.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/tutorial/Meeting_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/tutorial/Meeting_Type.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/tutorial/Meeting_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/tutorial/RoomNumber.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/tutorial/RoomNumber.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/tutorial/RoomNumber.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/tutorial/RoomNumber.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/tutorial/RoomNumber_Type.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/tutorial/RoomNumber_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/tutorial/RoomNumber_Type.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/tutorial/RoomNumber_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/tutorial/SentenceAnnot.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/tutorial/SentenceAnnot.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/tutorial/SentenceAnnot.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/tutorial/SentenceAnnot.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/tutorial/SentenceAnnot_Type.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/tutorial/SentenceAnnot_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/tutorial/SentenceAnnot_Type.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/tutorial/SentenceAnnot_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/tutorial/TimeAnnot.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/tutorial/TimeAnnot.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/tutorial/TimeAnnot.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/tutorial/TimeAnnot.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/tutorial/TimeAnnot_Type.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/tutorial/TimeAnnot_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/tutorial/TimeAnnot_Type.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/tutorial/TimeAnnot_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/tutorial/UimaAcronym.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/tutorial/UimaAcronym.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/tutorial/UimaAcronym.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/tutorial/UimaAcronym.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/tutorial/UimaAcronym_Type.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/tutorial/UimaAcronym_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/tutorial/UimaAcronym_Type.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/tutorial/UimaAcronym_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/tutorial/UimaMeeting.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/tutorial/UimaMeeting.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/tutorial/UimaMeeting.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/tutorial/UimaMeeting.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/tutorial/UimaMeeting_Type.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/tutorial/UimaMeeting_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/tutorial/UimaMeeting_Type.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/tutorial/UimaMeeting_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/tutorial/WordAnnot.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/tutorial/WordAnnot.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/tutorial/WordAnnot.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/tutorial/WordAnnot.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/tutorial/WordAnnot_Type.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/tutorial/WordAnnot_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/tutorial/WordAnnot_Type.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/tutorial/WordAnnot_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/tutorial/ex1/RoomNumberAnnotator.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/tutorial/ex1/RoomNumberAnnotator.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/tutorial/ex1/RoomNumberAnnotator.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/tutorial/ex1/RoomNumberAnnotator.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/tutorial/ex2/RoomNumberAnnotator.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/tutorial/ex2/RoomNumberAnnotator.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/tutorial/ex2/RoomNumberAnnotator.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/tutorial/ex2/RoomNumberAnnotator.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/tutorial/ex3/TutorialDateTime.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/tutorial/ex3/TutorialDateTime.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/tutorial/ex3/TutorialDateTime.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/tutorial/ex3/TutorialDateTime.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/tutorial/ex4/MeetingAnnotator.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/tutorial/ex4/MeetingAnnotator.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/tutorial/ex4/MeetingAnnotator.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/tutorial/ex4/MeetingAnnotator.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/tutorial/ex5/RoomNumberAnnotator.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/tutorial/ex5/RoomNumberAnnotator.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/tutorial/ex5/RoomNumberAnnotator.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/tutorial/ex5/RoomNumberAnnotator.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/tutorial/ex6/StringMapResource.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/tutorial/ex6/StringMapResource.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/tutorial/ex6/StringMapResource.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/tutorial/ex6/StringMapResource.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/tutorial/ex6/StringMapResource_impl.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/tutorial/ex6/StringMapResource_impl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/tutorial/ex6/StringMapResource_impl.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/tutorial/ex6/StringMapResource_impl.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/tutorial/ex6/UimaAcronymAnnotator.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/tutorial/ex6/UimaAcronymAnnotator.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/tutorial/ex6/UimaAcronymAnnotator.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/tutorial/ex6/UimaAcronymAnnotator.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/tutorial/ex6/UimaMeetingAnnotator.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/tutorial/ex6/UimaMeetingAnnotator.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/java/org/apache/uima/tutorial/ex6/UimaMeetingAnnotator.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/java/org/apache/uima/tutorial/ex6/UimaMeetingAnnotator.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/OpenNLPReadme.html b/uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/OpenNLPReadme.html similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/OpenNLPReadme.html rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/OpenNLPReadme.html
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/descriptors/OpenNLPAggregate.xml b/uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/descriptors/OpenNLPAggregate.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/descriptors/OpenNLPAggregate.xml rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/descriptors/OpenNLPAggregate.xml
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/descriptors/OpenNLPNEDetector.xml b/uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/descriptors/OpenNLPNEDetector.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/descriptors/OpenNLPNEDetector.xml rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/descriptors/OpenNLPNEDetector.xml
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/descriptors/OpenNLPPOSTagger.xml b/uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/descriptors/OpenNLPPOSTagger.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/descriptors/OpenNLPPOSTagger.xml rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/descriptors/OpenNLPPOSTagger.xml
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/descriptors/OpenNLPParser.xml b/uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/descriptors/OpenNLPParser.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/descriptors/OpenNLPParser.xml rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/descriptors/OpenNLPParser.xml
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/descriptors/OpenNLPSentenceDetector.xml b/uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/descriptors/OpenNLPSentenceDetector.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/descriptors/OpenNLPSentenceDetector.xml rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/descriptors/OpenNLPSentenceDetector.xml
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/descriptors/OpenNLPTokenAndSentenceAggregate.xml b/uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/descriptors/OpenNLPTokenAndSentenceAggregate.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/descriptors/OpenNLPTokenAndSentenceAggregate.xml rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/descriptors/OpenNLPTokenAndSentenceAggregate.xml
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/descriptors/OpenNLPTokenizer.xml b/uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/descriptors/OpenNLPTokenizer.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/descriptors/OpenNLPTokenizer.xml rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/descriptors/OpenNLPTokenizer.xml
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/ADJP.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/ADJP.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/ADJP.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/ADJP.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/ADJP_Type.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/ADJP_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/ADJP_Type.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/ADJP_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/ADVP.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/ADVP.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/ADVP.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/ADVP.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/ADVP_Type.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/ADVP_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/ADVP_Type.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/ADVP_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/CONJP.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/CONJP.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/CONJP.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/CONJP.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/CONJP_Type.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/CONJP_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/CONJP_Type.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/CONJP_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/Clause.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/Clause.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/Clause.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/Clause.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/Clause_Type.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/Clause_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/Clause_Type.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/Clause_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/Date.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/Date.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/Date.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/Date.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/Date_Type.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/Date_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/Date_Type.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/Date_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/EntityAnnotation.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/EntityAnnotation.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/EntityAnnotation.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/EntityAnnotation.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/EntityAnnotation_Type.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/EntityAnnotation_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/EntityAnnotation_Type.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/EntityAnnotation_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/FRAG.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/FRAG.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/FRAG.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/FRAG.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/FRAG_Type.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/FRAG_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/FRAG_Type.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/FRAG_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/INTJ.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/INTJ.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/INTJ.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/INTJ.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/INTJ_Type.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/INTJ_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/INTJ_Type.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/INTJ_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/LST.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/LST.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/LST.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/LST.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/LST_Type.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/LST_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/LST_Type.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/LST_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/Location.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/Location.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/Location.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/Location.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/Location_Type.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/Location_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/Location_Type.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/Location_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/Money.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/Money.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/Money.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/Money.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/Money_Type.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/Money_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/Money_Type.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/Money_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/NAC.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/NAC.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/NAC.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/NAC.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/NAC_Type.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/NAC_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/NAC_Type.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/NAC_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/NP.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/NP.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/NP.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/NP.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/NP_Type.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/NP_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/NP_Type.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/NP_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/NX.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/NX.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/NX.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/NX.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/NX_Type.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/NX_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/NX_Type.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/NX_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/OpenNLPExampleTypes.xml b/uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/OpenNLPExampleTypes.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/OpenNLPExampleTypes.xml rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/OpenNLPExampleTypes.xml
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/Organization.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/Organization.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/Organization.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/Organization.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/Organization_Type.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/Organization_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/Organization_Type.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/Organization_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/PP.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/PP.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/PP.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/PP.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/PP_Type.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/PP_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/PP_Type.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/PP_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/PRNphrase.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/PRNphrase.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/PRNphrase.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/PRNphrase.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/PRNphrase_Type.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/PRNphrase_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/PRNphrase_Type.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/PRNphrase_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/PRT.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/PRT.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/PRT.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/PRT.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/PRT_Type.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/PRT_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/PRT_Type.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/PRT_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/Percentage.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/Percentage.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/Percentage.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/Percentage.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/Percentage_Type.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/Percentage_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/Percentage_Type.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/Percentage_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/Person.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/Person.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/Person.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/Person.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/Person_Type.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/Person_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/Person_Type.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/Person_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/Phrase.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/Phrase.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/Phrase.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/Phrase.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/Phrase_Type.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/Phrase_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/Phrase_Type.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/Phrase_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/QP.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/QP.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/QP.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/QP.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/QP_Type.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/QP_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/QP_Type.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/QP_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/RRC.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/RRC.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/RRC.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/RRC.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/RRC_Type.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/RRC_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/RRC_Type.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/RRC_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/S.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/S.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/S.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/S.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/SBAR.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/SBAR.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/SBAR.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/SBAR.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/SBARQ.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/SBARQ.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/SBARQ.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/SBARQ.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/SBARQ_Type.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/SBARQ_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/SBARQ_Type.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/SBARQ_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/SBAR_Type.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/SBAR_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/SBAR_Type.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/SBAR_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/SINV.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/SINV.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/SINV.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/SINV.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/SINV_Type.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/SINV_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/SINV_Type.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/SINV_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/SQ.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/SQ.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/SQ.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/SQ.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/SQ_Type.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/SQ_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/SQ_Type.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/SQ_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/S_Type.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/S_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/S_Type.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/S_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/Sentence.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/Sentence.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/Sentence.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/Sentence.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/Sentence_Type.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/Sentence_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/Sentence_Type.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/Sentence_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/SyntaxAnnotation.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/SyntaxAnnotation.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/SyntaxAnnotation.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/SyntaxAnnotation.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/SyntaxAnnotation_Type.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/SyntaxAnnotation_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/SyntaxAnnotation_Type.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/SyntaxAnnotation_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/Time.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/Time.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/Time.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/Time.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/Time_Type.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/Time_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/Time_Type.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/Time_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/Token.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/Token.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/Token.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/Token.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/Token_Type.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/Token_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/Token_Type.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/Token_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/UCP.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/UCP.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/UCP.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/UCP.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/UCP_Type.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/UCP_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/UCP_Type.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/UCP_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/VP.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/VP.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/VP.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/VP.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/VP_Type.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/VP_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/VP_Type.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/VP_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/WHADJP.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/WHADJP.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/WHADJP.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/WHADJP.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/WHADJP_Type.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/WHADJP_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/WHADJP_Type.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/WHADJP_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/WHAVP.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/WHAVP.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/WHAVP.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/WHAVP.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/WHAVP_Type.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/WHAVP_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/WHAVP_Type.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/WHAVP_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/WHNP.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/WHNP.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/WHNP.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/WHNP.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/WHNP_Type.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/WHNP_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/WHNP_Type.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/WHNP_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/WHPP.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/WHPP.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/WHPP.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/WHPP.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/WHPP_Type.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/WHPP_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/WHPP_Type.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/WHPP_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/X.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/X.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/X.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/X.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/X_Type.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/X_Type.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/X_Type.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/X_Type.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/annotator/NEDetector.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/annotator/NEDetector.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/annotator/NEDetector.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/annotator/NEDetector.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/annotator/POSTagger.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/annotator/POSTagger.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/annotator/POSTagger.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/annotator/POSTagger.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/annotator/Parser.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/annotator/Parser.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/annotator/Parser.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/annotator/Parser.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/annotator/SentenceDetector.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/annotator/SentenceDetector.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/annotator/SentenceDetector.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/annotator/SentenceDetector.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/annotator/Tokenizer.java b/uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/annotator/Tokenizer.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/annotator/Tokenizer.java rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/opennlp_wrappers/src/org/apache/uima/examples/opennlp/annotator/Tokenizer.java
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/resources/GovernmentTitlePatterns.dat b/uimaj-2.2.1-incubating/uimaj-examples/src/main/resources/GovernmentTitlePatterns.dat similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/resources/GovernmentTitlePatterns.dat rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/resources/GovernmentTitlePatterns.dat
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/resources/org/apache/uima/examples/SourceDocumentInformation.xml b/uimaj-2.2.1-incubating/uimaj-examples/src/main/resources/org/apache/uima/examples/SourceDocumentInformation.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/resources/org/apache/uima/examples/SourceDocumentInformation.xml rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/resources/org/apache/uima/examples/SourceDocumentInformation.xml
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/resources/org/apache/uima/examples/cas/RegExAnnotator_Messages.properties b/uimaj-2.2.1-incubating/uimaj-examples/src/main/resources/org/apache/uima/examples/cas/RegExAnnotator_Messages.properties similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/resources/org/apache/uima/examples/cas/RegExAnnotator_Messages.properties rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/resources/org/apache/uima/examples/cas/RegExAnnotator_Messages.properties
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/resources/org/apache/uima/examples/casMultiplier/ExampleCasMultiplierMessages.properties b/uimaj-2.2.1-incubating/uimaj-examples/src/main/resources/org/apache/uima/examples/casMultiplier/ExampleCasMultiplierMessages.properties similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/resources/org/apache/uima/examples/casMultiplier/ExampleCasMultiplierMessages.properties rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/resources/org/apache/uima/examples/casMultiplier/ExampleCasMultiplierMessages.properties
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/resources/org/apache/uima/tutorial/ex5/RoomNumberAnnotator_Messages.properties b/uimaj-2.2.1-incubating/uimaj-examples/src/main/resources/org/apache/uima/tutorial/ex5/RoomNumberAnnotator_Messages.properties similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/resources/org/apache/uima/tutorial/ex5/RoomNumberAnnotator_Messages.properties rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/resources/org/apache/uima/tutorial/ex5/RoomNumberAnnotator_Messages.properties
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/resources/org/apache/uima/tutorial/ex6/uimaAcronyms.txt b/uimaj-2.2.1-incubating/uimaj-examples/src/main/resources/org/apache/uima/tutorial/ex6/uimaAcronyms.txt similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/resources/org/apache/uima/tutorial/ex6/uimaAcronyms.txt rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/resources/org/apache/uima/tutorial/ex6/uimaAcronyms.txt
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/run_configuration/UIMA Annotation Viewer.launch b/uimaj-2.2.1-incubating/uimaj-examples/src/main/run_configuration/UIMA Annotation Viewer.launch similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/run_configuration/UIMA Annotation Viewer.launch rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/run_configuration/UIMA Annotation Viewer.launch
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/run_configuration/UIMA CAS Visual Debugger.launch b/uimaj-2.2.1-incubating/uimaj-examples/src/main/run_configuration/UIMA CAS Visual Debugger.launch similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/run_configuration/UIMA CAS Visual Debugger.launch rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/run_configuration/UIMA CAS Visual Debugger.launch
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/run_configuration/UIMA CPE GUI.launch b/uimaj-2.2.1-incubating/uimaj-examples/src/main/run_configuration/UIMA CPE GUI.launch similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/run_configuration/UIMA CPE GUI.launch rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/run_configuration/UIMA CPE GUI.launch
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/run_configuration/UIMA Document Analyzer.launch b/uimaj-2.2.1-incubating/uimaj-examples/src/main/run_configuration/UIMA Document Analyzer.launch similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/run_configuration/UIMA Document Analyzer.launch rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/run_configuration/UIMA Document Analyzer.launch
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/run_configuration/UIMA JCasGen Merge.launch b/uimaj-2.2.1-incubating/uimaj-examples/src/main/run_configuration/UIMA JCasGen Merge.launch similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/run_configuration/UIMA JCasGen Merge.launch rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/run_configuration/UIMA JCasGen Merge.launch
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/run_configuration/UIMA JCasGen.launch b/uimaj-2.2.1-incubating/uimaj-examples/src/main/run_configuration/UIMA JCasGen.launch similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/run_configuration/UIMA JCasGen.launch rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/run_configuration/UIMA JCasGen.launch
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/run_configuration/UIMA PEAR Installer.launch b/uimaj-2.2.1-incubating/uimaj-examples/src/main/run_configuration/UIMA PEAR Installer.launch similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/run_configuration/UIMA PEAR Installer.launch rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/run_configuration/UIMA PEAR Installer.launch
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/run_configuration/UIMA Run AE.launch b/uimaj-2.2.1-incubating/uimaj-examples/src/main/run_configuration/UIMA Run AE.launch similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/run_configuration/UIMA Run AE.launch rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/run_configuration/UIMA Run AE.launch
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/run_configuration/UIMA Run CPE.launch b/uimaj-2.2.1-incubating/uimaj-examples/src/main/run_configuration/UIMA Run CPE.launch similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/run_configuration/UIMA Run CPE.launch rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/run_configuration/UIMA Run CPE.launch
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/run_configuration/UIMA Start VNS.launch b/uimaj-2.2.1-incubating/uimaj-examples/src/main/run_configuration/UIMA Start VNS.launch similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/run_configuration/UIMA Start VNS.launch rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/run_configuration/UIMA Start VNS.launch
diff --git a/uimaj-2.2.1-06/uimaj-examples/src/main/run_configuration/UIMA Start Vinci Service.launch b/uimaj-2.2.1-incubating/uimaj-examples/src/main/run_configuration/UIMA Start Vinci Service.launch similarity index 100% rename from uimaj-2.2.1-06/uimaj-examples/src/main/run_configuration/UIMA Start Vinci Service.launch rename to uimaj-2.2.1-incubating/uimaj-examples/src/main/run_configuration/UIMA Start Vinci Service.launch
diff --git a/uimaj-2.2.1-06/uimaj-internal-tools/HOWTO b/uimaj-2.2.1-incubating/uimaj-internal-tools/HOWTO similarity index 100% rename from uimaj-2.2.1-06/uimaj-internal-tools/HOWTO rename to uimaj-2.2.1-incubating/uimaj-internal-tools/HOWTO
diff --git a/uimaj-2.2.1-06/uimaj-internal-tools/pom.xml b/uimaj-2.2.1-incubating/uimaj-internal-tools/pom.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-internal-tools/pom.xml rename to uimaj-2.2.1-incubating/uimaj-internal-tools/pom.xml
diff --git a/uimaj-2.2.1-06/uimaj-internal-tools/src/main/java/org/apache/uima/internal/tools/LevelIssueAnalyzer.java b/uimaj-2.2.1-incubating/uimaj-internal-tools/src/main/java/org/apache/uima/internal/tools/LevelIssueAnalyzer.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-internal-tools/src/main/java/org/apache/uima/internal/tools/LevelIssueAnalyzer.java rename to uimaj-2.2.1-incubating/uimaj-internal-tools/src/main/java/org/apache/uima/internal/tools/LevelIssueAnalyzer.java
diff --git a/uimaj-2.2.1-06/uimaj-jet-expander/JetExpander.launch b/uimaj-2.2.1-incubating/uimaj-jet-expander/JetExpander.launch similarity index 100% rename from uimaj-2.2.1-06/uimaj-jet-expander/JetExpander.launch rename to uimaj-2.2.1-incubating/uimaj-jet-expander/JetExpander.launch
diff --git a/uimaj-2.2.1-06/uimaj-jet-expander/JetExpander_Type.launch b/uimaj-2.2.1-incubating/uimaj-jet-expander/JetExpander_Type.launch similarity index 100% rename from uimaj-2.2.1-06/uimaj-jet-expander/JetExpander_Type.launch rename to uimaj-2.2.1-incubating/uimaj-jet-expander/JetExpander_Type.launch
diff --git a/uimaj-2.2.1-06/uimaj-jet-expander/Readme.txt b/uimaj-2.2.1-incubating/uimaj-jet-expander/Readme.txt similarity index 100% rename from uimaj-2.2.1-06/uimaj-jet-expander/Readme.txt rename to uimaj-2.2.1-incubating/uimaj-jet-expander/Readme.txt
diff --git a/uimaj-2.2.1-06/uimaj-jet-expander/src/org/apache/uima/util/jet/JetExpander.java b/uimaj-2.2.1-incubating/uimaj-jet-expander/src/org/apache/uima/util/jet/JetExpander.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-jet-expander/src/org/apache/uima/util/jet/JetExpander.java rename to uimaj-2.2.1-incubating/uimaj-jet-expander/src/org/apache/uima/util/jet/JetExpander.java
diff --git a/uimaj-2.2.1-06/uimaj-test-util/pom.xml b/uimaj-2.2.1-incubating/uimaj-test-util/pom.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-test-util/pom.xml rename to uimaj-2.2.1-incubating/uimaj-test-util/pom.xml
diff --git a/uimaj-2.2.1-06/uimaj-test-util/src/main/java/org/apache/uima/test/junit_extension/ExceptionPrinter.java b/uimaj-2.2.1-incubating/uimaj-test-util/src/main/java/org/apache/uima/test/junit_extension/ExceptionPrinter.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-test-util/src/main/java/org/apache/uima/test/junit_extension/ExceptionPrinter.java rename to uimaj-2.2.1-incubating/uimaj-test-util/src/main/java/org/apache/uima/test/junit_extension/ExceptionPrinter.java
diff --git a/uimaj-2.2.1-06/uimaj-test-util/src/main/java/org/apache/uima/test/junit_extension/FileCompare.java b/uimaj-2.2.1-incubating/uimaj-test-util/src/main/java/org/apache/uima/test/junit_extension/FileCompare.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-test-util/src/main/java/org/apache/uima/test/junit_extension/FileCompare.java rename to uimaj-2.2.1-incubating/uimaj-test-util/src/main/java/org/apache/uima/test/junit_extension/FileCompare.java
diff --git a/uimaj-2.2.1-06/uimaj-test-util/src/main/java/org/apache/uima/test/junit_extension/JUnitExtension.java b/uimaj-2.2.1-incubating/uimaj-test-util/src/main/java/org/apache/uima/test/junit_extension/JUnitExtension.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-test-util/src/main/java/org/apache/uima/test/junit_extension/JUnitExtension.java rename to uimaj-2.2.1-incubating/uimaj-test-util/src/main/java/org/apache/uima/test/junit_extension/JUnitExtension.java
diff --git a/uimaj-2.2.1-06/uimaj-test-util/src/main/java/org/apache/uima/test/junit_extension/JUnitTestRunner.java b/uimaj-2.2.1-incubating/uimaj-test-util/src/main/java/org/apache/uima/test/junit_extension/JUnitTestRunner.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-test-util/src/main/java/org/apache/uima/test/junit_extension/JUnitTestRunner.java rename to uimaj-2.2.1-incubating/uimaj-test-util/src/main/java/org/apache/uima/test/junit_extension/JUnitTestRunner.java
diff --git a/uimaj-2.2.1-06/uimaj-test-util/src/main/java/org/apache/uima/test/junit_extension/ManageOutputDevice.java b/uimaj-2.2.1-incubating/uimaj-test-util/src/main/java/org/apache/uima/test/junit_extension/ManageOutputDevice.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-test-util/src/main/java/org/apache/uima/test/junit_extension/ManageOutputDevice.java rename to uimaj-2.2.1-incubating/uimaj-test-util/src/main/java/org/apache/uima/test/junit_extension/ManageOutputDevice.java
diff --git a/uimaj-2.2.1-06/uimaj-test-util/src/main/java/org/apache/uima/test/junit_extension/TeePrintStream.java b/uimaj-2.2.1-incubating/uimaj-test-util/src/main/java/org/apache/uima/test/junit_extension/TeePrintStream.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-test-util/src/main/java/org/apache/uima/test/junit_extension/TeePrintStream.java rename to uimaj-2.2.1-incubating/uimaj-test-util/src/main/java/org/apache/uima/test/junit_extension/TeePrintStream.java
diff --git a/uimaj-2.2.1-06/uimaj-test-util/src/main/java/org/apache/uima/test/junit_extension/UIMAResultPrinter.java b/uimaj-2.2.1-incubating/uimaj-test-util/src/main/java/org/apache/uima/test/junit_extension/UIMAResultPrinter.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-test-util/src/main/java/org/apache/uima/test/junit_extension/UIMAResultPrinter.java rename to uimaj-2.2.1-incubating/uimaj-test-util/src/main/java/org/apache/uima/test/junit_extension/UIMAResultPrinter.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/pom.xml b/uimaj-2.2.1-incubating/uimaj-tools/pom.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/pom.xml rename to uimaj-2.2.1-incubating/uimaj-tools/pom.xml
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/AnnotationFeaturesViewer.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/AnnotationFeaturesViewer.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/AnnotationFeaturesViewer.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/AnnotationFeaturesViewer.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/AnnotationViewerMain.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/AnnotationViewerMain.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/AnnotationViewerMain.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/AnnotationViewerMain.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/RunAE.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/RunAE.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/RunAE.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/RunAE.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/ValidateDescriptor.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/ValidateDescriptor.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/ValidateDescriptor.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/ValidateDescriptor.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/annot_view/Gladis.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/annot_view/Gladis.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/annot_view/Gladis.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/annot_view/Gladis.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/components/FileSystemCollectionReader.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/components/FileSystemCollectionReader.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/components/FileSystemCollectionReader.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/components/FileSystemCollectionReader.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/components/InlineXmlCasConsumer.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/components/InlineXmlCasConsumer.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/components/InlineXmlCasConsumer.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/components/InlineXmlCasConsumer.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/components/XCasWriterCasConsumer.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/components/XCasWriterCasConsumer.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/components/XCasWriterCasConsumer.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/components/XCasWriterCasConsumer.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/components/XmiWriterCasConsumer.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/components/XmiWriterCasConsumer.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/components/XmiWriterCasConsumer.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/components/XmiWriterCasConsumer.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/components/XmlDetagger.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/components/XmlDetagger.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/components/XmlDetagger.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/components/XmlDetagger.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cpm/AnalysisEnginePanel.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cpm/AnalysisEnginePanel.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cpm/AnalysisEnginePanel.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cpm/AnalysisEnginePanel.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cpm/ConfigField.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cpm/ConfigField.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cpm/ConfigField.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cpm/ConfigField.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cpm/ConsumerPanel.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cpm/ConsumerPanel.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cpm/ConsumerPanel.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cpm/ConsumerPanel.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cpm/CpmFrame.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cpm/CpmFrame.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cpm/CpmFrame.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cpm/CpmFrame.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cpm/CpmPanel.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cpm/CpmPanel.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cpm/CpmPanel.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cpm/CpmPanel.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cpm/ElapsedTimeFormatter.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cpm/ElapsedTimeFormatter.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cpm/ElapsedTimeFormatter.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cpm/ElapsedTimeFormatter.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cpm/JTabbedPaneWithCloseIcons.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cpm/JTabbedPaneWithCloseIcons.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cpm/JTabbedPaneWithCloseIcons.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cpm/JTabbedPaneWithCloseIcons.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cpm/MetaDataPanel.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cpm/MetaDataPanel.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cpm/MetaDataPanel.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cpm/MetaDataPanel.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cpm/PerformanceReportDialog.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cpm/PerformanceReportDialog.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cpm/PerformanceReportDialog.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cpm/PerformanceReportDialog.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cpm/TabClosedListener.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cpm/TabClosedListener.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cpm/TabClosedListener.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cpm/TabClosedListener.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/AnnotationDisplayCustomizationFrame.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/AnnotationDisplayCustomizationFrame.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/AnnotationDisplayCustomizationFrame.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/AnnotationDisplayCustomizationFrame.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/AnnotationExtent.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/AnnotationExtent.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/AnnotationExtent.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/AnnotationExtent.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/ArrayNode.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/ArrayNode.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/ArrayNode.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/ArrayNode.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/CVD.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/CVD.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/CVD.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/CVD.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/ColorIcon.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/ColorIcon.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/ColorIcon.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/ColorIcon.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/FSNode.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/FSNode.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/FSNode.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/FSNode.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/FSTreeModel.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/FSTreeModel.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/FSTreeModel.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/FSTreeModel.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/FSTreeNode.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/FSTreeNode.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/FSTreeNode.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/FSTreeNode.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/IndexTreeNode.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/IndexTreeNode.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/IndexTreeNode.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/IndexTreeNode.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/LogFileViewer.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/LogFileViewer.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/LogFileViewer.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/LogFileViewer.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/MainFrame.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/MainFrame.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/MainFrame.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/MainFrame.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/MarkupExtent.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/MarkupExtent.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/MarkupExtent.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/MarkupExtent.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/MultiAnnotViewerFrame.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/MultiAnnotViewerFrame.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/MultiAnnotViewerFrame.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/MultiAnnotViewerFrame.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/MultiMarkup.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/MultiMarkup.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/MultiMarkup.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/MultiMarkup.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/StringFsPopupEventAdapter.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/StringFsPopupEventAdapter.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/StringFsPopupEventAdapter.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/StringFsPopupEventAdapter.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/TypeTreeNode.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/TypeTreeNode.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/TypeTreeNode.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/TypeTreeNode.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/AboutHandler.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/AboutHandler.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/AboutHandler.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/AboutHandler.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/AboutUimaHandler.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/AboutUimaHandler.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/AboutUimaHandler.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/AboutUimaHandler.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/AddCPHandler.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/AddCPHandler.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/AddCPHandler.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/AddCPHandler.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/AddLanguageHandler.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/AddLanguageHandler.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/AddLanguageHandler.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/AddLanguageHandler.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/AnnotatorOpenEventHandler.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/AnnotatorOpenEventHandler.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/AnnotatorOpenEventHandler.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/AnnotatorOpenEventHandler.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/AnnotatorRerunEventHandler.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/AnnotatorRerunEventHandler.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/AnnotatorRerunEventHandler.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/AnnotatorRerunEventHandler.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/AnnotatorRunOnCasEventHandler.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/AnnotatorRunOnCasEventHandler.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/AnnotatorRunOnCasEventHandler.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/AnnotatorRunOnCasEventHandler.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/CaretChangeHandler.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/CaretChangeHandler.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/CaretChangeHandler.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/CaretChangeHandler.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/CloseAnnotationViewHandler.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/CloseAnnotationViewHandler.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/CloseAnnotationViewHandler.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/CloseAnnotationViewHandler.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/CloseLogViewHandler.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/CloseLogViewHandler.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/CloseLogViewHandler.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/CloseLogViewHandler.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/CloseTypeSystemHandler.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/CloseTypeSystemHandler.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/CloseTypeSystemHandler.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/CloseTypeSystemHandler.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/ColorPrefsOpenHandler.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/ColorPrefsOpenHandler.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/ColorPrefsOpenHandler.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/ColorPrefsOpenHandler.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/ColorPrefsSaveHandler.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/ColorPrefsSaveHandler.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/ColorPrefsSaveHandler.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/ColorPrefsSaveHandler.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/FSTreeSelectionListener.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/FSTreeSelectionListener.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/FSTreeSelectionListener.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/FSTreeSelectionListener.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/FileOpenEventHandler.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/FileOpenEventHandler.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/FileOpenEventHandler.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/FileOpenEventHandler.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/FileSaveAsEventHandler.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/FileSaveAsEventHandler.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/FileSaveAsEventHandler.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/FileSaveAsEventHandler.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/FileSaveEventHandler.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/FileSaveEventHandler.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/FileSaveEventHandler.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/FileSaveEventHandler.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/FocusFSAction.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/FocusFSAction.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/FocusFSAction.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/FocusFSAction.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/FocusIRAction.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/FocusIRAction.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/FocusIRAction.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/FocusIRAction.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/FocusTextAction.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/FocusTextAction.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/FocusTextAction.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/FocusTextAction.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/HelpHandler.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/HelpHandler.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/HelpHandler.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/HelpHandler.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/IndexPopupListener.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/IndexPopupListener.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/IndexPopupListener.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/IndexPopupListener.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/IndexTreeSelectionListener.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/IndexTreeSelectionListener.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/IndexTreeSelectionListener.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/IndexTreeSelectionListener.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/LoadRecentDescFileEventHandler.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/LoadRecentDescFileEventHandler.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/LoadRecentDescFileEventHandler.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/LoadRecentDescFileEventHandler.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/LoadRecentTextFileEventHandler.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/LoadRecentTextFileEventHandler.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/LoadRecentTextFileEventHandler.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/LoadRecentTextFileEventHandler.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/MainFrameClosing.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/MainFrameClosing.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/MainFrameClosing.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/MainFrameClosing.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/ManualHandler.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/ManualHandler.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/ManualHandler.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/ManualHandler.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/NewTextEventHandler.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/NewTextEventHandler.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/NewTextEventHandler.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/NewTextEventHandler.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/PopupHandler.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/PopupHandler.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/PopupHandler.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/PopupHandler.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/PopupListener.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/PopupListener.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/PopupListener.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/PopupListener.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/RemoveCodePageHandler.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/RemoveCodePageHandler.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/RemoveCodePageHandler.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/RemoveCodePageHandler.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/RemoveLanguageHandler.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/RemoveLanguageHandler.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/RemoveLanguageHandler.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/RemoveLanguageHandler.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/RestoreCPDefaultsHandler.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/RestoreCPDefaultsHandler.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/RestoreCPDefaultsHandler.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/RestoreCPDefaultsHandler.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/RestoreLangDefaultsHandler.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/RestoreLangDefaultsHandler.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/RestoreLangDefaultsHandler.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/RestoreLangDefaultsHandler.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/SetCodePageHandler.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/SetCodePageHandler.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/SetCodePageHandler.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/SetCodePageHandler.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/SetDataPathHandler.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/SetDataPathHandler.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/SetDataPathHandler.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/SetDataPathHandler.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/SetLanguageHandler.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/SetLanguageHandler.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/SetLanguageHandler.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/SetLanguageHandler.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/SetLogConfigHandler.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/SetLogConfigHandler.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/SetLogConfigHandler.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/SetLogConfigHandler.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/ShowAnnotatedTextHandler.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/ShowAnnotatedTextHandler.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/ShowAnnotatedTextHandler.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/ShowAnnotatedTextHandler.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/ShowAnnotationCustomizerHandler.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/ShowAnnotationCustomizerHandler.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/ShowAnnotationCustomizerHandler.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/ShowAnnotationCustomizerHandler.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/ShowTypesystemHandler.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/ShowTypesystemHandler.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/ShowTypesystemHandler.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/ShowTypesystemHandler.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/SofaSelectionListener.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/SofaSelectionListener.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/SofaSelectionListener.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/SofaSelectionListener.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/SystemExitHandler.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/SystemExitHandler.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/SystemExitHandler.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/SystemExitHandler.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/TextChangedListener.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/TextChangedListener.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/TextChangedListener.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/TextChangedListener.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/TextContextMenuAction.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/TextContextMenuAction.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/TextContextMenuAction.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/TextContextMenuAction.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/TextFocusHandler.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/TextFocusHandler.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/TextFocusHandler.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/TextFocusHandler.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/TreeFocusHandler.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/TreeFocusHandler.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/TreeFocusHandler.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/TreeFocusHandler.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/TypeSystemFileOpenEventHandler.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/TypeSystemFileOpenEventHandler.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/TypeSystemFileOpenEventHandler.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/TypeSystemFileOpenEventHandler.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/UndoMgr.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/UndoMgr.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/UndoMgr.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/UndoMgr.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/XCASFileOpenEventHandler.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/XCASFileOpenEventHandler.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/XCASFileOpenEventHandler.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/XCASFileOpenEventHandler.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/XCASSaveHandler.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/XCASSaveHandler.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/XCASSaveHandler.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/XCASSaveHandler.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/XCASSaveTSHandler.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/XCASSaveTSHandler.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/XCASSaveTSHandler.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/XCASSaveTSHandler.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/XmiCasFileOpenHandler.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/XmiCasFileOpenHandler.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/XmiCasFileOpenHandler.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/XmiCasFileOpenHandler.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/XmiCasSaveHandler.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/XmiCasSaveHandler.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/XmiCasSaveHandler.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/XmiCasSaveHandler.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/tsview/FeatureTableModel.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/tsview/FeatureTableModel.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/tsview/FeatureTableModel.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/tsview/FeatureTableModel.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/tsview/MainFrame.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/tsview/MainFrame.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/tsview/MainFrame.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/tsview/MainFrame.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/docanalyzer/AnnotationViewerDialog.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/docanalyzer/AnnotationViewerDialog.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/docanalyzer/AnnotationViewerDialog.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/docanalyzer/AnnotationViewerDialog.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/docanalyzer/DocumentAnalyzer.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/docanalyzer/DocumentAnalyzer.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/docanalyzer/DocumentAnalyzer.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/docanalyzer/DocumentAnalyzer.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/docanalyzer/FileSelector.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/docanalyzer/FileSelector.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/docanalyzer/FileSelector.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/docanalyzer/FileSelector.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/docanalyzer/FileSelectorListener.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/docanalyzer/FileSelectorListener.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/docanalyzer/FileSelectorListener.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/docanalyzer/FileSelectorListener.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/docanalyzer/PrefsMediator.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/docanalyzer/PrefsMediator.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/docanalyzer/PrefsMediator.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/docanalyzer/PrefsMediator.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/docanalyzer/TfDocumentListener.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/docanalyzer/TfDocumentListener.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/docanalyzer/TfDocumentListener.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/docanalyzer/TfDocumentListener.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/docanalyzer/TfFileSelectorListener.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/docanalyzer/TfFileSelectorListener.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/docanalyzer/TfFileSelectorListener.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/docanalyzer/TfFileSelectorListener.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/docanalyzer/TfFocusListener.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/docanalyzer/TfFocusListener.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/docanalyzer/TfFocusListener.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/docanalyzer/TfFocusListener.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/images/Images.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/images/Images.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/images/Images.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/images/Images.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/GUI.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/GUI.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/GUI.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/GUI.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/GuiErrorImpl.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/GuiErrorImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/GuiErrorImpl.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/GuiErrorImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/GuiProgressMonitor.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/GuiProgressMonitor.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/GuiProgressMonitor.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/GuiProgressMonitor.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/IError.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/IError.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/IError.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/IError.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/IMerge.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/IMerge.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/IMerge.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/IMerge.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/IProgressMonitor.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/IProgressMonitor.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/IProgressMonitor.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/IProgressMonitor.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/JCasTypeTemplate.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/JCasTypeTemplate.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/JCasTypeTemplate.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/JCasTypeTemplate.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/JCas_TypeTemplate.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/JCas_TypeTemplate.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/JCas_TypeTemplate.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/JCas_TypeTemplate.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/Jg.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/Jg.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/Jg.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/Jg.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/LogThrowErrorImpl.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/LogThrowErrorImpl.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/LogThrowErrorImpl.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/LogThrowErrorImpl.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/Prefs.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/Prefs.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/Prefs.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/Prefs.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/TypeInfo.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/TypeInfo.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/TypeInfo.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/TypeInfo.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/UimaLoggerProgressMonitor.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/UimaLoggerProgressMonitor.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/UimaLoggerProgressMonitor.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/UimaLoggerProgressMonitor.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/Waiter.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/Waiter.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/Waiter.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/Waiter.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/package.html b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/package.html similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/package.html rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/package.html
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/migration/IbmUimaToApacheUima.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/migration/IbmUimaToApacheUima.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/migration/IbmUimaToApacheUima.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/migration/IbmUimaToApacheUima.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/pear/install/InstallPear.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/pear/install/InstallPear.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/pear/install/InstallPear.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/pear/install/InstallPear.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/pear/merger/PMController.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/pear/merger/PMController.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/pear/merger/PMController.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/pear/merger/PMController.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/pear/merger/PMControllerHelper.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/pear/merger/PMControllerHelper.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/pear/merger/PMControllerHelper.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/pear/merger/PMControllerHelper.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/pear/merger/PMUimaAgent.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/pear/merger/PMUimaAgent.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/pear/merger/PMUimaAgent.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/pear/merger/PMUimaAgent.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/pear/packager/PearPackager.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/pear/packager/PearPackager.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/pear/packager/PearPackager.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/pear/packager/PearPackager.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/AnTreeListener.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/AnTreeListener.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/AnTreeListener.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/AnTreeListener.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/AnnotationFeaturesViewer.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/AnnotationFeaturesViewer.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/AnnotationFeaturesViewer.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/AnnotationFeaturesViewer.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/ColorEditor.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/ColorEditor.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/ColorEditor.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/ColorEditor.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/ColorParser.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/ColorParser.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/ColorParser.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/ColorParser.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/ColorRenderer.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/ColorRenderer.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/ColorRenderer.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/ColorRenderer.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/LabelCellEditor.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/LabelCellEditor.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/LabelCellEditor.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/LabelCellEditor.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/MyCellRenderer.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/MyCellRenderer.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/MyCellRenderer.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/MyCellRenderer.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/StyleConstants.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/StyleConstants.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/StyleConstants.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/StyleConstants.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/StyleMapEditor.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/StyleMapEditor.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/StyleMapEditor.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/StyleMapEditor.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/StyleMapEntry.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/StyleMapEntry.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/StyleMapEntry.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/StyleMapEntry.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/StyleMapTable.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/StyleMapTable.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/StyleMapTable.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/StyleMapTable.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/StyleMapTableModel.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/StyleMapTableModel.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/StyleMapTableModel.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/StyleMapTableModel.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/StyleMapXmlParser.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/StyleMapXmlParser.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/StyleMapXmlParser.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/StyleMapXmlParser.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/TableDropAdapter.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/TableDropAdapter.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/TableDropAdapter.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/TableDropAdapter.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/TableGUIMediator.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/TableGUIMediator.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/TableGUIMediator.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/TableGUIMediator.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/TableSelectionListener.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/TableSelectionListener.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/TableSelectionListener.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/TableSelectionListener.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/util/gui/AboutDialog.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/util/gui/AboutDialog.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/util/gui/AboutDialog.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/util/gui/AboutDialog.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/util/gui/Caption.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/util/gui/Caption.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/util/gui/Caption.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/util/gui/Caption.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/util/gui/FileChooserBugWorkarounds.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/util/gui/FileChooserBugWorkarounds.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/util/gui/FileChooserBugWorkarounds.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/util/gui/FileChooserBugWorkarounds.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/util/gui/FileSelector.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/util/gui/FileSelector.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/util/gui/FileSelector.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/util/gui/FileSelector.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/util/gui/FileSelectorListener.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/util/gui/FileSelectorListener.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/util/gui/FileSelectorListener.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/util/gui/FileSelectorListener.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/util/gui/FormPanel.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/util/gui/FormPanel.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/util/gui/FormPanel.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/util/gui/FormPanel.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/util/gui/ImageButton.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/util/gui/ImageButton.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/util/gui/ImageButton.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/util/gui/ImageButton.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/util/gui/IntegerField.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/util/gui/IntegerField.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/util/gui/IntegerField.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/util/gui/IntegerField.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/util/gui/ListSelector.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/util/gui/ListSelector.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/util/gui/ListSelector.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/util/gui/ListSelector.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/util/gui/SliderField.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/util/gui/SliderField.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/util/gui/SliderField.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/util/gui/SliderField.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/util/gui/SpringUtilities.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/util/gui/SpringUtilities.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/util/gui/SpringUtilities.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/util/gui/SpringUtilities.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/util/gui/SwingWorker.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/util/gui/SwingWorker.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/util/gui/SwingWorker.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/util/gui/SwingWorker.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/util/gui/TransportControlListener.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/util/gui/TransportControlListener.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/util/gui/TransportControlListener.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/util/gui/TransportControlListener.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/util/gui/TransportControlPanel.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/util/gui/TransportControlPanel.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/util/gui/TransportControlPanel.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/util/gui/TransportControlPanel.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/util/gui/XMLFileFilter.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/util/gui/XMLFileFilter.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/util/gui/XMLFileFilter.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/util/gui/XMLFileFilter.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/util/htmlview/AnnotationViewGenerator.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/util/htmlview/AnnotationViewGenerator.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/util/htmlview/AnnotationViewGenerator.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/util/htmlview/AnnotationViewGenerator.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/viewer/CasAnnotationViewer.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/viewer/CasAnnotationViewer.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/viewer/CasAnnotationViewer.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/viewer/CasAnnotationViewer.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/viewer/CasAnnotationViewerApplet.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/viewer/CasAnnotationViewerApplet.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/viewer/CasAnnotationViewerApplet.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/viewer/CasAnnotationViewerApplet.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/viewer/CasTreeViewer.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/viewer/CasTreeViewer.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/viewer/CasTreeViewer.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/viewer/CasTreeViewer.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/viewer/CasTreeViewerApplet.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/viewer/CasTreeViewerApplet.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/viewer/CasTreeViewerApplet.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/viewer/CasTreeViewerApplet.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/viewer/EntityResolver.java b/uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/viewer/EntityResolver.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/java/org/apache/uima/tools/viewer/EntityResolver.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/java/org/apache/uima/tools/viewer/EntityResolver.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/javajet/jcasgen/includedTemplates/AnnotationMethods.javajet b/uimaj-2.2.1-incubating/uimaj-tools/src/main/javajet/jcasgen/includedTemplates/AnnotationMethods.javajet similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/javajet/jcasgen/includedTemplates/AnnotationMethods.javajet rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/javajet/jcasgen/includedTemplates/AnnotationMethods.javajet
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/javajet/jcasgen/includedTemplates/Annotation_Methods.javajet b/uimaj-2.2.1-incubating/uimaj-tools/src/main/javajet/jcasgen/includedTemplates/Annotation_Methods.javajet similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/javajet/jcasgen/includedTemplates/Annotation_Methods.javajet rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/javajet/jcasgen/includedTemplates/Annotation_Methods.javajet
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/javajet/jcasgen/includedTemplates/ArrayBoundsChecking.javajet b/uimaj-2.2.1-incubating/uimaj-tools/src/main/javajet/jcasgen/includedTemplates/ArrayBoundsChecking.javajet similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/javajet/jcasgen/includedTemplates/ArrayBoundsChecking.javajet rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/javajet/jcasgen/includedTemplates/ArrayBoundsChecking.javajet
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/javajet/jcasgen/includedTemplates/FeatOkTesting.javajet b/uimaj-2.2.1-incubating/uimaj-tools/src/main/javajet/jcasgen/includedTemplates/FeatOkTesting.javajet similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/javajet/jcasgen/includedTemplates/FeatOkTesting.javajet rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/javajet/jcasgen/includedTemplates/FeatOkTesting.javajet
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/javajet/jcasgen/includedTemplates/FeatOk_Testing.javajet b/uimaj-2.2.1-incubating/uimaj-tools/src/main/javajet/jcasgen/includedTemplates/FeatOk_Testing.javajet similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/javajet/jcasgen/includedTemplates/FeatOk_Testing.javajet rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/javajet/jcasgen/includedTemplates/FeatOk_Testing.javajet
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/javajet/jcasgen/templates/JCasType.javajet b/uimaj-2.2.1-incubating/uimaj-tools/src/main/javajet/jcasgen/templates/JCasType.javajet similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/javajet/jcasgen/templates/JCasType.javajet rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/javajet/jcasgen/templates/JCasType.javajet
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/javajet/jcasgen/templates/JCas_Type.javajet b/uimaj-2.2.1-incubating/uimaj-tools/src/main/javajet/jcasgen/templates/JCas_Type.javajet similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/javajet/jcasgen/templates/JCas_Type.javajet rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/javajet/jcasgen/templates/JCas_Type.javajet
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/resources/JCasGenFileConsoleLogger.properties b/uimaj-2.2.1-incubating/uimaj-tools/src/main/resources/JCasGenFileConsoleLogger.properties similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/resources/JCasGenFileConsoleLogger.properties rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/resources/JCasGenFileConsoleLogger.properties
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/resources/org/apache/uima/tools/annot_view/Logger.properties b/uimaj-2.2.1-incubating/uimaj-tools/src/main/resources/org/apache/uima/tools/annot_view/Logger.properties similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/resources/org/apache/uima/tools/annot_view/Logger.properties rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/resources/org/apache/uima/tools/annot_view/Logger.properties
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/resources/org/apache/uima/tools/components/FileSystemCollectionReader.xml b/uimaj-2.2.1-incubating/uimaj-tools/src/main/resources/org/apache/uima/tools/components/FileSystemCollectionReader.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/resources/org/apache/uima/tools/components/FileSystemCollectionReader.xml rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/resources/org/apache/uima/tools/components/FileSystemCollectionReader.xml
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/resources/org/apache/uima/tools/components/InlineXmlCasConsumer.xml b/uimaj-2.2.1-incubating/uimaj-tools/src/main/resources/org/apache/uima/tools/components/InlineXmlCasConsumer.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/resources/org/apache/uima/tools/components/InlineXmlCasConsumer.xml rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/resources/org/apache/uima/tools/components/InlineXmlCasConsumer.xml
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/resources/org/apache/uima/tools/components/XCasWriterCasConsumer.xml b/uimaj-2.2.1-incubating/uimaj-tools/src/main/resources/org/apache/uima/tools/components/XCasWriterCasConsumer.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/resources/org/apache/uima/tools/components/XCasWriterCasConsumer.xml rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/resources/org/apache/uima/tools/components/XCasWriterCasConsumer.xml
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/resources/org/apache/uima/tools/components/XmiWriterCasConsumer.xml b/uimaj-2.2.1-incubating/uimaj-tools/src/main/resources/org/apache/uima/tools/components/XmiWriterCasConsumer.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/resources/org/apache/uima/tools/components/XmiWriterCasConsumer.xml rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/resources/org/apache/uima/tools/components/XmiWriterCasConsumer.xml
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/resources/org/apache/uima/tools/components/XmlDetagger.xml b/uimaj-2.2.1-incubating/uimaj-tools/src/main/resources/org/apache/uima/tools/components/XmlDetagger.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/resources/org/apache/uima/tools/components/XmlDetagger.xml rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/resources/org/apache/uima/tools/components/XmlDetagger.xml
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/resources/org/apache/uima/tools/images/Micro_16.gif b/uimaj-2.2.1-incubating/uimaj-tools/src/main/resources/org/apache/uima/tools/images/Micro_16.gif similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/resources/org/apache/uima/tools/images/Micro_16.gif rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/resources/org/apache/uima/tools/images/Micro_16.gif Binary files differ
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/resources/org/apache/uima/tools/images/RowDelete_24.gif b/uimaj-2.2.1-incubating/uimaj-tools/src/main/resources/org/apache/uima/tools/images/RowDelete_24.gif similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/resources/org/apache/uima/tools/images/RowDelete_24.gif rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/resources/org/apache/uima/tools/images/RowDelete_24.gif Binary files differ
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/resources/org/apache/uima/tools/images/UIMA_banner.png b/uimaj-2.2.1-incubating/uimaj-tools/src/main/resources/org/apache/uima/tools/images/UIMA_banner.png similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/resources/org/apache/uima/tools/images/UIMA_banner.png rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/resources/org/apache/uima/tools/images/UIMA_banner.png Binary files differ
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/resources/org/apache/uima/tools/images/UIMA_logo_50.png b/uimaj-2.2.1-incubating/uimaj-tools/src/main/resources/org/apache/uima/tools/images/UIMA_logo_50.png similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/resources/org/apache/uima/tools/images/UIMA_logo_50.png rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/resources/org/apache/uima/tools/images/UIMA_logo_50.png Binary files differ
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/resources/org/apache/uima/tools/images/UIMA_logo_big.png b/uimaj-2.2.1-incubating/uimaj-tools/src/main/resources/org/apache/uima/tools/images/UIMA_logo_big.png similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/resources/org/apache/uima/tools/images/UIMA_logo_big.png rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/resources/org/apache/uima/tools/images/UIMA_logo_big.png Binary files differ
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/resources/org/apache/uima/tools/images/down_24.gif b/uimaj-2.2.1-incubating/uimaj-tools/src/main/resources/org/apache/uima/tools/images/down_24.gif similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/resources/org/apache/uima/tools/images/down_24.gif rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/resources/org/apache/uima/tools/images/down_24.gif Binary files differ
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/resources/org/apache/uima/tools/images/forward_24.gif b/uimaj-2.2.1-incubating/uimaj-tools/src/main/resources/org/apache/uima/tools/images/forward_24.gif similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/resources/org/apache/uima/tools/images/forward_24.gif rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/resources/org/apache/uima/tools/images/forward_24.gif Binary files differ
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/resources/org/apache/uima/tools/images/pause_24.gif b/uimaj-2.2.1-incubating/uimaj-tools/src/main/resources/org/apache/uima/tools/images/pause_24.gif similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/resources/org/apache/uima/tools/images/pause_24.gif rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/resources/org/apache/uima/tools/images/pause_24.gif Binary files differ
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/resources/org/apache/uima/tools/images/play_24.gif b/uimaj-2.2.1-incubating/uimaj-tools/src/main/resources/org/apache/uima/tools/images/play_24.gif similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/resources/org/apache/uima/tools/images/play_24.gif rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/resources/org/apache/uima/tools/images/play_24.gif Binary files differ
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/resources/org/apache/uima/tools/images/smallarrow_16.gif b/uimaj-2.2.1-incubating/uimaj-tools/src/main/resources/org/apache/uima/tools/images/smallarrow_16.gif similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/resources/org/apache/uima/tools/images/smallarrow_16.gif rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/resources/org/apache/uima/tools/images/smallarrow_16.gif Binary files differ
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/resources/org/apache/uima/tools/images/stop_24.gif b/uimaj-2.2.1-incubating/uimaj-tools/src/main/resources/org/apache/uima/tools/images/stop_24.gif similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/resources/org/apache/uima/tools/images/stop_24.gif rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/resources/org/apache/uima/tools/images/stop_24.gif Binary files differ
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/resources/org/apache/uima/tools/images/text_16.gif b/uimaj-2.2.1-incubating/uimaj-tools/src/main/resources/org/apache/uima/tools/images/text_16.gif similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/resources/org/apache/uima/tools/images/text_16.gif rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/resources/org/apache/uima/tools/images/text_16.gif Binary files differ
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/resources/org/apache/uima/tools/images/up_24.gif b/uimaj-2.2.1-incubating/uimaj-tools/src/main/resources/org/apache/uima/tools/images/up_24.gif similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/resources/org/apache/uima/tools/images/up_24.gif rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/resources/org/apache/uima/tools/images/up_24.gif Binary files differ
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/resources/org/apache/uima/tools/images/xml_16.gif b/uimaj-2.2.1-incubating/uimaj-tools/src/main/resources/org/apache/uima/tools/images/xml_16.gif similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/resources/org/apache/uima/tools/images/xml_16.gif rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/resources/org/apache/uima/tools/images/xml_16.gif Binary files differ
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/resources/org/apache/uima/tools/jcasgen/jMergeCtl.xml b/uimaj-2.2.1-incubating/uimaj-tools/src/main/resources/org/apache/uima/tools/jcasgen/jMergeCtl.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/resources/org/apache/uima/tools/jcasgen/jMergeCtl.xml rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/resources/org/apache/uima/tools/jcasgen/jMergeCtl.xml
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/resources/org/apache/uima/tools/jcasgen/jcasgenpPluginResources.properties b/uimaj-2.2.1-incubating/uimaj-tools/src/main/resources/org/apache/uima/tools/jcasgen/jcasgenpPluginResources.properties similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/resources/org/apache/uima/tools/jcasgen/jcasgenpPluginResources.properties rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/resources/org/apache/uima/tools/jcasgen/jcasgenpPluginResources.properties
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/resources/org/apache/uima/tools/migration/packageMapping.txt b/uimaj-2.2.1-incubating/uimaj-tools/src/main/resources/org/apache/uima/tools/migration/packageMapping.txt similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/resources/org/apache/uima/tools/migration/packageMapping.txt rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/resources/org/apache/uima/tools/migration/packageMapping.txt
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/resources/org/apache/uima/tools/migration/stringReplacements.txt b/uimaj-2.2.1-incubating/uimaj-tools/src/main/resources/org/apache/uima/tools/migration/stringReplacements.txt similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/resources/org/apache/uima/tools/migration/stringReplacements.txt rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/resources/org/apache/uima/tools/migration/stringReplacements.txt
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/resources/org/apache/uima/tools/pear/install/piHelp.html b/uimaj-2.2.1-incubating/uimaj-tools/src/main/resources/org/apache/uima/tools/pear/install/piHelp.html similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/resources/org/apache/uima/tools/pear/install/piHelp.html rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/resources/org/apache/uima/tools/pear/install/piHelp.html
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/resources/org/apache/uima/tools/util/gui/about.txt b/uimaj-2.2.1-incubating/uimaj-tools/src/main/resources/org/apache/uima/tools/util/gui/about.txt similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/resources/org/apache/uima/tools/util/gui/about.txt rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/resources/org/apache/uima/tools/util/gui/about.txt
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/resources/org/apache/uima/tools/util/htmlview/annotationViewer.js b/uimaj-2.2.1-incubating/uimaj-tools/src/main/resources/org/apache/uima/tools/util/htmlview/annotationViewer.js similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/resources/org/apache/uima/tools/util/htmlview/annotationViewer.js rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/resources/org/apache/uima/tools/util/htmlview/annotationViewer.js
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/resources/org/apache/uima/tools/util/htmlview/annotations.xsl b/uimaj-2.2.1-incubating/uimaj-tools/src/main/resources/org/apache/uima/tools/util/htmlview/annotations.xsl similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/resources/org/apache/uima/tools/util/htmlview/annotations.xsl rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/resources/org/apache/uima/tools/util/htmlview/annotations.xsl
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/resources/org/apache/uima/tools/util/htmlview/index.html b/uimaj-2.2.1-incubating/uimaj-tools/src/main/resources/org/apache/uima/tools/util/htmlview/index.html similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/resources/org/apache/uima/tools/util/htmlview/index.html rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/resources/org/apache/uima/tools/util/htmlview/index.html
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/resources/org/apache/uima/tools/util/htmlview/styleMapToCss.xsl b/uimaj-2.2.1-incubating/uimaj-tools/src/main/resources/org/apache/uima/tools/util/htmlview/styleMapToCss.xsl similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/resources/org/apache/uima/tools/util/htmlview/styleMapToCss.xsl rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/resources/org/apache/uima/tools/util/htmlview/styleMapToCss.xsl
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/resources/org/apache/uima/tools/util/htmlview/styleMapToDocFrameXsl.xsl b/uimaj-2.2.1-incubating/uimaj-tools/src/main/resources/org/apache/uima/tools/util/htmlview/styleMapToDocFrameXsl.xsl similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/resources/org/apache/uima/tools/util/htmlview/styleMapToDocFrameXsl.xsl rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/resources/org/apache/uima/tools/util/htmlview/styleMapToDocFrameXsl.xsl
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/resources/org/apache/uima/tools/util/htmlview/styleMapToLegend.xsl b/uimaj-2.2.1-incubating/uimaj-tools/src/main/resources/org/apache/uima/tools/util/htmlview/styleMapToLegend.xsl similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/resources/org/apache/uima/tools/util/htmlview/styleMapToLegend.xsl rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/resources/org/apache/uima/tools/util/htmlview/styleMapToLegend.xsl
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/resources/org/apache/uima/tools/viewer/CasAnnotationViewerApplet.html b/uimaj-2.2.1-incubating/uimaj-tools/src/main/resources/org/apache/uima/tools/viewer/CasAnnotationViewerApplet.html similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/resources/org/apache/uima/tools/viewer/CasAnnotationViewerApplet.html rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/resources/org/apache/uima/tools/viewer/CasAnnotationViewerApplet.html
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/main/resources/org/apache/uima/tools/viewer/CasTreeViewerApplet.html b/uimaj-2.2.1-incubating/uimaj-tools/src/main/resources/org/apache/uima/tools/viewer/CasTreeViewerApplet.html similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/main/resources/org/apache/uima/tools/viewer/CasTreeViewerApplet.html rename to uimaj-2.2.1-incubating/uimaj-tools/src/main/resources/org/apache/uima/tools/viewer/CasTreeViewerApplet.html
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/test/java/org/apache/uima/tools/pear/merger/PearMergerTest.java b/uimaj-2.2.1-incubating/uimaj-tools/src/test/java/org/apache/uima/tools/pear/merger/PearMergerTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/test/java/org/apache/uima/tools/pear/merger/PearMergerTest.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/test/java/org/apache/uima/tools/pear/merger/PearMergerTest.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/test/java/org/apache/uima/tools/viewer/CasAnnotationViewerTest.java b/uimaj-2.2.1-incubating/uimaj-tools/src/test/java/org/apache/uima/tools/viewer/CasAnnotationViewerTest.java similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/test/java/org/apache/uima/tools/viewer/CasAnnotationViewerTest.java rename to uimaj-2.2.1-incubating/uimaj-tools/src/test/java/org/apache/uima/tools/viewer/CasAnnotationViewerTest.java
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/test/resources/pearTests/pearMergerTests/uima.example.DateTime.pear b/uimaj-2.2.1-incubating/uimaj-tools/src/test/resources/pearTests/pearMergerTests/uima.example.DateTime.pear similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/test/resources/pearTests/pearMergerTests/uima.example.DateTime.pear rename to uimaj-2.2.1-incubating/uimaj-tools/src/test/resources/pearTests/pearMergerTests/uima.example.DateTime.pear Binary files differ
diff --git a/uimaj-2.2.1-06/uimaj-tools/src/test/resources/pearTests/pearMergerTests/uima.example.RoomNumber.pear b/uimaj-2.2.1-incubating/uimaj-tools/src/test/resources/pearTests/pearMergerTests/uima.example.RoomNumber.pear similarity index 100% rename from uimaj-2.2.1-06/uimaj-tools/src/test/resources/pearTests/pearMergerTests/uima.example.RoomNumber.pear rename to uimaj-2.2.1-incubating/uimaj-tools/src/test/resources/pearTests/pearMergerTests/uima.example.RoomNumber.pear Binary files differ
diff --git a/uimaj-2.2.1-06/uimaj/pom.xml b/uimaj-2.2.1-incubating/uimaj/pom.xml similarity index 100% rename from uimaj-2.2.1-06/uimaj/pom.xml rename to uimaj-2.2.1-incubating/uimaj/pom.xml