You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2020/09/14 18:07:37 UTC

[isis] branch master updated: ISIS-2426: relocating 'commons' and also changing artifact names

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

ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git


The following commit(s) were added to refs/heads/master by this push:
     new 76eb5cc  ISIS-2426: relocating 'commons' and also changing artifact names
76eb5cc is described below

commit 76eb5cc5c14f52417584f61d54f2adca53aa8b63
Author: Andi Huber <ah...@apache.org>
AuthorDate: Mon Sep 14 20:07:17 2020 +0200

    ISIS-2426: relocating 'commons' and also changing artifact names
---
 antora/pom.xml                                             |  2 +-
 api/applib/build.gradle                                    |  2 +-
 api/applib/pom.xml                                         |  6 +++---
 api/schema/build.gradle                                    |  2 +-
 api/schema/pom.xml                                         |  2 +-
 {core/commons => commons}/.gitignore                       |  0
 {core/commons => commons}/build.gradle                     |  0
 {core/commons => commons}/pom.xml                          | 14 ++++++++------
 {core/commons => commons}/src/main/adoc/antora.yml         |  0
 .../src/main/adoc/modules/commons/examples/.gitignore      |  0
 .../src/main/adoc/modules/commons/nav.adoc                 |  0
 .../src/main/adoc/modules/commons/pages/about.adoc         |  0
 .../modules/commons/pages/concurrent-task-list-UNUSED.adoc |  0
 .../src/main/adoc/modules/commons/partials/module-nav.adoc |  0
 .../apache/isis/core/commons/IsisModuleCoreCommons.java    |  0
 .../org/apache/isis/core/commons/binding/Bindable.java     |  0
 .../apache/isis/core/commons/binding/ChangeListener.java   |  0
 .../isis/core/commons/binding/InvalidationListener.java    |  0
 .../org/apache/isis/core/commons/binding/Observable.java   |  0
 .../org/apache/isis/core/commons/binding/Writable.java     |  0
 .../java/org/apache/isis/core/commons/collections/Can.java |  0
 .../apache/isis/core/commons/collections/CanVector.java    |  0
 .../apache/isis/core/commons/collections/Can_Empty.java    |  0
 .../apache/isis/core/commons/collections/Can_Multiple.java |  0
 .../isis/core/commons/collections/Can_Singleton.java       |  0
 .../apache/isis/core/commons/collections/Cardinality.java  |  0
 .../isis/core/commons/collections/ImmutableEnumSet.java    |  0
 .../isis/core/commons/concurrent/AwaitableLatch.java       |  0
 .../isis/core/commons/exceptions/ExceptionUtils.java       |  0
 .../core/commons/exceptions/IsisApplicationException.java  |  0
 .../apache/isis/core/commons/exceptions/IsisException.java |  0
 .../core/commons/exceptions/UnexpectedCallException.java   |  0
 .../isis/core/commons/exceptions/UnknownTypeException.java |  0
 .../apache/isis/core/commons/exceptions/package-info.java  |  0
 .../isis/core/commons/handler/ChainOfResponsibility.java   |  0
 .../org/apache/isis/core/commons/internal/_Constants.java  |  0
 .../isis/core/commons/internal/assertions/_Assert.java     |  0
 .../apache/isis/core/commons/internal/base/_Blackhole.java |  0
 .../org/apache/isis/core/commons/internal/base/_Bytes.java |  0
 .../core/commons/internal/base/_Bytes_GZipCompressor.java  |  0
 .../commons/internal/base/_Bytes_GZipCompressorSmart.java  |  0
 .../org/apache/isis/core/commons/internal/base/_Casts.java |  0
 .../apache/isis/core/commons/internal/base/_Either.java    |  0
 .../org/apache/isis/core/commons/internal/base/_Lazy.java  |  0
 .../isis/core/commons/internal/base/_Lazy_Simple.java      |  0
 .../isis/core/commons/internal/base/_Lazy_ThreadSafe.java  |  0
 .../apache/isis/core/commons/internal/base/_NullSafe.java  |  0
 .../apache/isis/core/commons/internal/base/_Oneshot.java   |  0
 .../apache/isis/core/commons/internal/base/_Reduction.java |  0
 .../apache/isis/core/commons/internal/base/_Strings.java   |  0
 .../core/commons/internal/base/_Strings_FastSplit.java     |  0
 .../core/commons/internal/base/_Strings_HtmlEscaper.java   |  0
 .../core/commons/internal/base/_Strings_KeyValuePair.java  |  0
 .../core/commons/internal/base/_Strings_NaturalNames.java  |  0
 .../core/commons/internal/base/_Strings_SplitIterator.java |  0
 .../apache/isis/core/commons/internal/base/_Timing.java    |  0
 .../apache/isis/core/commons/internal/base/_Tuples.java    |  0
 .../org/apache/isis/core/commons/internal/base/_With.java  |  0
 .../isis/core/commons/internal/base/package-info.java      |  0
 .../internal/binding/InternalBidirectionalBinding.java     |  0
 .../isis/core/commons/internal/binding/InternalUtil.java   |  0
 .../core/commons/internal/binding/_BindableAbstract.java   |  0
 .../isis/core/commons/internal/binding/_Bindables.java     |  0
 .../isis/core/commons/internal/binding/_Observables.java   |  0
 .../isis/core/commons/internal/binding/package-info.java   |  0
 .../core/commons/internal/codec/_DocumentFactories.java    |  0
 .../isis/core/commons/internal/codec/_UrlDecoderUtil.java  |  0
 .../isis/core/commons/internal/collections/_Arrays.java    |  0
 .../commons/internal/collections/_Arrays_Collector.java    |  0
 .../internal/collections/_Arrays_CollectorUnknownSize.java |  0
 .../core/commons/internal/collections/_Collections.java    |  0
 .../internal/collections/_Collections_Collector.java       |  0
 .../internal/collections/_Collections_SortedSetOfList.java |  0
 .../isis/core/commons/internal/collections/_Inbox.java     |  0
 .../isis/core/commons/internal/collections/_Lists.java     |  0
 .../isis/core/commons/internal/collections/_Maps.java      |  0
 .../isis/core/commons/internal/collections/_Multimaps.java |  0
 .../isis/core/commons/internal/collections/_Sets.java      |  0
 .../isis/core/commons/internal/collections/_Streams.java   |  0
 .../core/commons/internal/collections/package-info.java    |  0
 .../internal/collections/snapshot/_VersionedList.java      |  0
 .../isis/core/commons/internal/compare/_Comparators.java   |  0
 .../internal/compare/_Comparators_SequenceCompare.java     |  0
 .../isis/core/commons/internal/compare/package-info.java   |  0
 .../commons/internal/concurrent/_ConcurrentContext.java    |  0
 .../core/commons/internal/concurrent/_ConcurrentTask.java  |  0
 .../commons/internal/concurrent/_ConcurrentTaskList.java   |  0
 .../core/commons/internal/concurrent/_ThreadSleep.java     |  0
 .../isis/core/commons/internal/context/_Context.java       |  0
 .../commons/internal/context/_Context_ThreadLocal.java     |  0
 .../apache/isis/core/commons/internal/context/_Plugin.java |  0
 .../isis/core/commons/internal/context/package-info.java   |  0
 .../apache/isis/core/commons/internal/debug/_Probe.java    |  0
 .../isis/core/commons/internal/debug/package-info.java     |  0
 .../core/commons/internal/environment/DeploymentType.java  |  0
 .../internal/environment/IsisSystemEnvironment.java        |  0
 .../isis/core/commons/internal/exceptions/_Exceptions.java |  0
 .../core/commons/internal/exceptions/package-info.java     |  0
 .../internal/factory/InstanceCreationClassException.java   |  0
 .../internal/factory/InstanceCreationException.java        |  0
 .../isis/core/commons/internal/factory/InstanceUtil.java   |  0
 .../internal/factory/UnavailableClassException.java        |  0
 .../isis/core/commons/internal/factory/package-info.java   |  0
 .../isis/core/commons/internal/functions/_Functions.java   |  0
 .../functions/_Functions_IndexAwareFunctionAdapter.java    |  0
 .../isis/core/commons/internal/functions/_Predicates.java  |  0
 .../isis/core/commons/internal/functions/package-info.java |  0
 .../apache/isis/core/commons/internal/hash/_Hashes.java    |  0
 .../isis/core/commons/internal/ioc/IocContainer.java       |  0
 .../isis/core/commons/internal/ioc/ManagedBeanAdapter.java |  0
 .../isis/core/commons/internal/ioc/PriorityConstants.java  |  0
 .../isis/core/commons/internal/ioc/cdi/BeanAdapterCDI.java |  0
 .../isis/core/commons/internal/ioc/cdi/CdiPlugin.java      |  0
 .../apache/isis/core/commons/internal/ioc/cdi/_CDI.java    |  0
 .../isis/core/commons/internal/ioc/cdi/_CDI_Lifecycle.java |  0
 .../commons/internal/ioc/spring/BeanAdapterSpring.java     |  0
 .../isis/core/commons/internal/ioc/spring/EventSpring.java |  0
 .../commons/internal/ioc/spring/IocContainerSpring.java    |  0
 .../isis/core/commons/internal/ioc/spring/_Spring.java     |  0
 .../isis/core/commons/internal/memento/_Mementos.java      |  0
 .../commons/internal/memento/_Mementos_MementoDefault.java |  0
 .../isis/core/commons/internal/memento/package-info.java   |  0
 .../apache/isis/core/commons/internal/package-info.java    |  0
 .../commons/internal/plugins/PluginResolveException.java   |  0
 .../commons/internal/plugins/codegen/ProxyFactory.java     |  0
 .../internal/plugins/codegen/ProxyFactoryService.java      |  0
 .../plugins/codegen/ProxyFactoryServiceAbstract.java       |  0
 .../internal/plugins/ioc/ConversationContextHandle.java    |  0
 .../internal/plugins/ioc/ConversationContextService.java   |  0
 .../plugins/ioc/ConversationContextServiceDefault.java     |  0
 .../isis/core/commons/internal/primitives/_Ints.java       |  0
 .../isis/core/commons/internal/primitives/_Longs.java      |  0
 .../core/commons/internal/reflection/_Annotations.java     |  0
 .../commons/internal/reflection/_AnnotationsLegacy.java    |  0
 .../internal/reflection/_Annotations_AttributeMethods.java |  0
 .../internal/reflection/_Annotations_SyntCache.java        |  0
 ...tions_SynthesizedMergedAnnotationInvocationHandler.java |  0
 .../core/commons/internal/reflection/_MethodCache.java     |  0
 .../isis/core/commons/internal/reflection/_Reflect.java    |  0
 .../core/commons/internal/reflection/package-info.java     |  0
 .../apache/isis/core/commons/internal/resources/_Json.java |  0
 .../isis/core/commons/internal/resources/_Resources.java   |  0
 .../isis/core/commons/internal/resources/package-info.java |  0
 .../org/apache/isis/core/commons/SerializationTester.java  |  0
 .../org/apache/isis/core/commons/collections/CanTest.java  |  0
 .../isis/core/commons/collections/CanVectorTest.java       |  0
 .../core/commons/handlers/ChainOfResponsibilityTest.java   |  0
 .../apache/isis/core/commons/internal/base/BytesTest.java  |  0
 .../isis/core/commons/internal/base/NullSafeTest.java      |  0
 .../isis/core/commons/internal/base/ReductionTest.java     |  0
 .../isis/core/commons/internal/base/StringsTest.java       |  0
 .../isis/core/commons/internal/binding/BindableTest.java   |  0
 .../org/apache/isis/core/commons/internal/cdi/CDITest.java |  0
 .../commons/internal/cdi/ValidQualifierForTesting.java     |  0
 .../isis/core/commons/internal/collections/Samples.java    |  0
 .../core/commons/internal/collections/_ArraysTest.java     |  0
 .../isis/core/commons/internal/collections/_MapsTest.java  |  0
 .../isis/core/commons/internal/collections/_SetsTest.java  |  0
 .../internal/collections/snapshot/VersionedListTest.java   |  0
 .../core/commons/internal/compare/ComparatorsTest.java     |  0
 .../internal/concurrent/ConcurrentTaskListTest.java        |  0
 .../isis/core/commons/internal/context/ContextTest.java    |  0
 .../isis/core/commons/internal/primitives/IntsTest.java    |  0
 .../core/commons/internal/resources/ResourcesTest.java     |  0
 .../isis/core/commons/internal/strings/FormatTest.java     |  0
 core/codegen-bytebuddy/build.gradle                        |  2 +-
 core/codegen-bytebuddy/pom.xml                             |  6 +++---
 core/config/build.gradle                                   |  2 +-
 core/config/pom.xml                                        |  6 +++---
 core/internaltestsupport/build.gradle                      |  2 +-
 core/internaltestsupport/pom.xml                           |  6 +++---
 core/metamodel/build.gradle                                |  2 +-
 core/metamodel/pom.xml                                     |  2 +-
 core/pom.xml                                               | 13 +++++++------
 core/runtime/pom.xml                                       |  2 +-
 core/runtimeservices/pom.xml                               |  2 +-
 core/security/pom.xml                                      |  2 +-
 core/webapp/pom.xml                                        |  2 +-
 examples/demo/domain/build.gradle                          |  2 +-
 examples/demo/wicket/build.gradle                          |  2 +-
 extensions/pom.xml                                         |  2 +-
 extensions/security/secman/api/build.gradle                |  2 +-
 incubator/pom.xml                                          |  2 +-
 isis-parent/pom.xml                                        |  2 +-
 legacy/mappings/restclient/build.gradle                    |  2 +-
 legacy/mappings/restclient/pom.xml                         |  4 ++--
 legacy/pom.xml                                             |  2 +-
 mappings/pom.xml                                           |  2 +-
 mappings/restclient/api/build.gradle                       |  2 +-
 mappings/restclient/api/pom.xml                            |  4 ++--
 mavendeps/pom.xml                                          |  4 ++--
 persistence/jdo/applib/build.gradle                        |  2 +-
 persistence/jdo/applib/pom.xml                             |  4 ++--
 persistence/jdo/pom.xml                                    |  2 +-
 persistence/jpa/applib/build.gradle                        |  2 +-
 persistence/jpa/applib/pom.xml                             |  4 ++--
 persistence/jpa/pom.xml                                    |  2 +-
 security/bypass/pom.xml                                    |  2 +-
 security/keycloak/pom.xml                                  |  2 +-
 security/shiro/pom.xml                                     |  2 +-
 settings.gradle                                            |  6 +++---
 starters/pom.xml                                           |  2 +-
 subdomains/pom.xml                                         |  2 +-
 testing/pom.xml                                            |  2 +-
 tooling/pom.xml                                            |  2 +-
 .../isis/tooling/projectmodel/test/ProjectTreeTest.java    |  2 +-
 valuetypes/asciidoc/applib/pom.xml                         |  4 ++--
 valuetypes/asciidoc/ui/wicket/build.gradle                 |  2 +-
 valuetypes/markdown/applib/pom.xml                         |  4 ++--
 valuetypes/pom.xml                                         |  2 +-
 viewers/common/pom.xml                                     |  2 +-
 viewers/restfulobjects/pom.xml                             |  2 +-
 viewers/wicket/pom.xml                                     |  2 +-
 213 files changed, 84 insertions(+), 81 deletions(-)

diff --git a/antora/pom.xml b/antora/pom.xml
index ce04bff..bcce501 100644
--- a/antora/pom.xml
+++ b/antora/pom.xml
@@ -15,7 +15,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.apache.isis.core</groupId>
+		<groupId>org.apache.isis</groupId>
 		<artifactId>isis-parent</artifactId>
 		<version>2.0.0-SNAPSHOT</version>
 		<relativePath>../isis-parent/pom.xml</relativePath>
diff --git a/api/applib/build.gradle b/api/applib/build.gradle
index e4abe42..2d9cc84 100644
--- a/api/applib/build.gradle
+++ b/api/applib/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'war'
 
 dependencies {
     compile project(':isis-parent:isis-schema')
-    compile project(':isis-parent:isis:isis-core-commons')
+    compile project(':isis-parent:isis:isis-commons')
 
     compile(Libs.javaeeApi)
     compile(Libs.findbugsAnnotations)
diff --git a/api/applib/pom.xml b/api/applib/pom.xml
index f87e9ce..ae98b79 100644
--- a/api/applib/pom.xml
+++ b/api/applib/pom.xml
@@ -22,7 +22,7 @@
 
     <parent>
         <groupId>org.apache.isis.core</groupId>
-        <artifactId>isis</artifactId>
+        <artifactId>isis-core</artifactId>
         <version>2.0.0-SNAPSHOT</version>
         <relativePath>../../core/pom.xml</relativePath>
     </parent>
@@ -71,8 +71,8 @@
     <dependencies>
     
         <dependency>
-            <groupId>org.apache.isis.core</groupId>
-            <artifactId>isis-core-commons</artifactId>
+            <groupId>org.apache.isis.commons</groupId>
+			<artifactId>isis-commons</artifactId>
             <scope>provided</scope>
         </dependency>
 
diff --git a/api/schema/build.gradle b/api/schema/build.gradle
index cfd4f4e..e655d48 100644
--- a/api/schema/build.gradle
+++ b/api/schema/build.gradle
@@ -16,7 +16,7 @@ sourceSets {
 }
 
 dependencies {
-    compile project(':isis-parent:isis:isis-core-commons')
+    compile project(':isis-parent:isis:isis-commons')
 
     compile(Libs.springContext)
     compile(Libs.jodaTime)
diff --git a/api/schema/pom.xml b/api/schema/pom.xml
index a9fd39e..d94edb4 100644
--- a/api/schema/pom.xml
+++ b/api/schema/pom.xml
@@ -16,7 +16,7 @@
 
 	<parent>
 		<groupId>org.apache.isis.core</groupId>
-		<artifactId>isis</artifactId>
+		<artifactId>isis-core</artifactId>
 		<version>2.0.0-SNAPSHOT</version>
 		<relativePath>../../core/pom.xml</relativePath>
 	</parent>
diff --git a/core/commons/.gitignore b/commons/.gitignore
similarity index 100%
rename from core/commons/.gitignore
rename to commons/.gitignore
diff --git a/core/commons/build.gradle b/commons/build.gradle
similarity index 100%
rename from core/commons/build.gradle
rename to commons/build.gradle
diff --git a/core/commons/pom.xml b/commons/pom.xml
similarity index 89%
rename from core/commons/pom.xml
rename to commons/pom.xml
index dbe65fa..a6431ce 100644
--- a/core/commons/pom.xml
+++ b/commons/pom.xml
@@ -16,20 +16,22 @@
 
 	<parent>
 		<groupId>org.apache.isis.core</groupId>
-		<artifactId>isis</artifactId>
+		<artifactId>isis-core</artifactId>
 		<version>2.0.0-SNAPSHOT</version>
+		<relativePath>../core/pom.xml</relativePath>
 	</parent>
 
-	<artifactId>isis-core-commons</artifactId>
+	<groupId>org.apache.isis.commons</groupId>
+	<artifactId>isis-commons</artifactId>
 
-	<name>Apache Isis Core - Commons</name>
+	<name>Apache Isis Commons</name>
 	<description>
-        Isis library, defining utilities required by both Applib and Unittestsupport.
+        Isis library, defining utilities required by the entire Apache Isis ecosystem.
     </description>
 
 	<properties>
-		<jar-plugin.automaticModuleName>org.apache.isis.core.commons</jar-plugin.automaticModuleName>
-		<git-plugin.propertiesDir>org/apache/isis/core/commons</git-plugin.propertiesDir>
+		<jar-plugin.automaticModuleName>org.apache.isis.commons</jar-plugin.automaticModuleName>
+		<git-plugin.propertiesDir>org/apache/isis/commons</git-plugin.propertiesDir>
 	</properties>
 
 	<build>
diff --git a/core/commons/src/main/adoc/antora.yml b/commons/src/main/adoc/antora.yml
similarity index 100%
rename from core/commons/src/main/adoc/antora.yml
rename to commons/src/main/adoc/antora.yml
diff --git a/core/commons/src/main/adoc/modules/commons/examples/.gitignore b/commons/src/main/adoc/modules/commons/examples/.gitignore
similarity index 100%
rename from core/commons/src/main/adoc/modules/commons/examples/.gitignore
rename to commons/src/main/adoc/modules/commons/examples/.gitignore
diff --git a/core/commons/src/main/adoc/modules/commons/nav.adoc b/commons/src/main/adoc/modules/commons/nav.adoc
similarity index 100%
rename from core/commons/src/main/adoc/modules/commons/nav.adoc
rename to commons/src/main/adoc/modules/commons/nav.adoc
diff --git a/core/commons/src/main/adoc/modules/commons/pages/about.adoc b/commons/src/main/adoc/modules/commons/pages/about.adoc
similarity index 100%
rename from core/commons/src/main/adoc/modules/commons/pages/about.adoc
rename to commons/src/main/adoc/modules/commons/pages/about.adoc
diff --git a/core/commons/src/main/adoc/modules/commons/pages/concurrent-task-list-UNUSED.adoc b/commons/src/main/adoc/modules/commons/pages/concurrent-task-list-UNUSED.adoc
similarity index 100%
rename from core/commons/src/main/adoc/modules/commons/pages/concurrent-task-list-UNUSED.adoc
rename to commons/src/main/adoc/modules/commons/pages/concurrent-task-list-UNUSED.adoc
diff --git a/core/commons/src/main/adoc/modules/commons/partials/module-nav.adoc b/commons/src/main/adoc/modules/commons/partials/module-nav.adoc
similarity index 100%
rename from core/commons/src/main/adoc/modules/commons/partials/module-nav.adoc
rename to commons/src/main/adoc/modules/commons/partials/module-nav.adoc
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/IsisModuleCoreCommons.java b/commons/src/main/java/org/apache/isis/core/commons/IsisModuleCoreCommons.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/IsisModuleCoreCommons.java
rename to commons/src/main/java/org/apache/isis/core/commons/IsisModuleCoreCommons.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/binding/Bindable.java b/commons/src/main/java/org/apache/isis/core/commons/binding/Bindable.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/binding/Bindable.java
rename to commons/src/main/java/org/apache/isis/core/commons/binding/Bindable.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/binding/ChangeListener.java b/commons/src/main/java/org/apache/isis/core/commons/binding/ChangeListener.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/binding/ChangeListener.java
rename to commons/src/main/java/org/apache/isis/core/commons/binding/ChangeListener.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/binding/InvalidationListener.java b/commons/src/main/java/org/apache/isis/core/commons/binding/InvalidationListener.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/binding/InvalidationListener.java
rename to commons/src/main/java/org/apache/isis/core/commons/binding/InvalidationListener.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/binding/Observable.java b/commons/src/main/java/org/apache/isis/core/commons/binding/Observable.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/binding/Observable.java
rename to commons/src/main/java/org/apache/isis/core/commons/binding/Observable.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/binding/Writable.java b/commons/src/main/java/org/apache/isis/core/commons/binding/Writable.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/binding/Writable.java
rename to commons/src/main/java/org/apache/isis/core/commons/binding/Writable.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/collections/Can.java b/commons/src/main/java/org/apache/isis/core/commons/collections/Can.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/collections/Can.java
rename to commons/src/main/java/org/apache/isis/core/commons/collections/Can.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/collections/CanVector.java b/commons/src/main/java/org/apache/isis/core/commons/collections/CanVector.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/collections/CanVector.java
rename to commons/src/main/java/org/apache/isis/core/commons/collections/CanVector.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/collections/Can_Empty.java b/commons/src/main/java/org/apache/isis/core/commons/collections/Can_Empty.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/collections/Can_Empty.java
rename to commons/src/main/java/org/apache/isis/core/commons/collections/Can_Empty.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/collections/Can_Multiple.java b/commons/src/main/java/org/apache/isis/core/commons/collections/Can_Multiple.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/collections/Can_Multiple.java
rename to commons/src/main/java/org/apache/isis/core/commons/collections/Can_Multiple.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/collections/Can_Singleton.java b/commons/src/main/java/org/apache/isis/core/commons/collections/Can_Singleton.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/collections/Can_Singleton.java
rename to commons/src/main/java/org/apache/isis/core/commons/collections/Can_Singleton.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/collections/Cardinality.java b/commons/src/main/java/org/apache/isis/core/commons/collections/Cardinality.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/collections/Cardinality.java
rename to commons/src/main/java/org/apache/isis/core/commons/collections/Cardinality.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/collections/ImmutableEnumSet.java b/commons/src/main/java/org/apache/isis/core/commons/collections/ImmutableEnumSet.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/collections/ImmutableEnumSet.java
rename to commons/src/main/java/org/apache/isis/core/commons/collections/ImmutableEnumSet.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/concurrent/AwaitableLatch.java b/commons/src/main/java/org/apache/isis/core/commons/concurrent/AwaitableLatch.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/concurrent/AwaitableLatch.java
rename to commons/src/main/java/org/apache/isis/core/commons/concurrent/AwaitableLatch.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/exceptions/ExceptionUtils.java b/commons/src/main/java/org/apache/isis/core/commons/exceptions/ExceptionUtils.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/exceptions/ExceptionUtils.java
rename to commons/src/main/java/org/apache/isis/core/commons/exceptions/ExceptionUtils.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/exceptions/IsisApplicationException.java b/commons/src/main/java/org/apache/isis/core/commons/exceptions/IsisApplicationException.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/exceptions/IsisApplicationException.java
rename to commons/src/main/java/org/apache/isis/core/commons/exceptions/IsisApplicationException.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/exceptions/IsisException.java b/commons/src/main/java/org/apache/isis/core/commons/exceptions/IsisException.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/exceptions/IsisException.java
rename to commons/src/main/java/org/apache/isis/core/commons/exceptions/IsisException.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/exceptions/UnexpectedCallException.java b/commons/src/main/java/org/apache/isis/core/commons/exceptions/UnexpectedCallException.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/exceptions/UnexpectedCallException.java
rename to commons/src/main/java/org/apache/isis/core/commons/exceptions/UnexpectedCallException.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/exceptions/UnknownTypeException.java b/commons/src/main/java/org/apache/isis/core/commons/exceptions/UnknownTypeException.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/exceptions/UnknownTypeException.java
rename to commons/src/main/java/org/apache/isis/core/commons/exceptions/UnknownTypeException.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/exceptions/package-info.java b/commons/src/main/java/org/apache/isis/core/commons/exceptions/package-info.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/exceptions/package-info.java
rename to commons/src/main/java/org/apache/isis/core/commons/exceptions/package-info.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/handler/ChainOfResponsibility.java b/commons/src/main/java/org/apache/isis/core/commons/handler/ChainOfResponsibility.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/handler/ChainOfResponsibility.java
rename to commons/src/main/java/org/apache/isis/core/commons/handler/ChainOfResponsibility.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/_Constants.java b/commons/src/main/java/org/apache/isis/core/commons/internal/_Constants.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/_Constants.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/_Constants.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/assertions/_Assert.java b/commons/src/main/java/org/apache/isis/core/commons/internal/assertions/_Assert.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/assertions/_Assert.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/assertions/_Assert.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Blackhole.java b/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Blackhole.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Blackhole.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/base/_Blackhole.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Bytes.java b/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Bytes.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Bytes.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/base/_Bytes.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Bytes_GZipCompressor.java b/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Bytes_GZipCompressor.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Bytes_GZipCompressor.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/base/_Bytes_GZipCompressor.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Bytes_GZipCompressorSmart.java b/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Bytes_GZipCompressorSmart.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Bytes_GZipCompressorSmart.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/base/_Bytes_GZipCompressorSmart.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Casts.java b/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Casts.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Casts.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/base/_Casts.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Either.java b/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Either.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Either.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/base/_Either.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Lazy.java b/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Lazy.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Lazy.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/base/_Lazy.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Lazy_Simple.java b/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Lazy_Simple.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Lazy_Simple.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/base/_Lazy_Simple.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Lazy_ThreadSafe.java b/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Lazy_ThreadSafe.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Lazy_ThreadSafe.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/base/_Lazy_ThreadSafe.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_NullSafe.java b/commons/src/main/java/org/apache/isis/core/commons/internal/base/_NullSafe.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_NullSafe.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/base/_NullSafe.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Oneshot.java b/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Oneshot.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Oneshot.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/base/_Oneshot.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Reduction.java b/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Reduction.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Reduction.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/base/_Reduction.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Strings.java b/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Strings.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Strings.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/base/_Strings.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Strings_FastSplit.java b/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Strings_FastSplit.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Strings_FastSplit.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/base/_Strings_FastSplit.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Strings_HtmlEscaper.java b/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Strings_HtmlEscaper.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Strings_HtmlEscaper.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/base/_Strings_HtmlEscaper.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Strings_KeyValuePair.java b/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Strings_KeyValuePair.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Strings_KeyValuePair.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/base/_Strings_KeyValuePair.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Strings_NaturalNames.java b/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Strings_NaturalNames.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Strings_NaturalNames.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/base/_Strings_NaturalNames.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Strings_SplitIterator.java b/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Strings_SplitIterator.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Strings_SplitIterator.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/base/_Strings_SplitIterator.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Timing.java b/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Timing.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Timing.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/base/_Timing.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Tuples.java b/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Tuples.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Tuples.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/base/_Tuples.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_With.java b/commons/src/main/java/org/apache/isis/core/commons/internal/base/_With.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_With.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/base/_With.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/package-info.java b/commons/src/main/java/org/apache/isis/core/commons/internal/base/package-info.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/base/package-info.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/base/package-info.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/binding/InternalBidirectionalBinding.java b/commons/src/main/java/org/apache/isis/core/commons/internal/binding/InternalBidirectionalBinding.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/binding/InternalBidirectionalBinding.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/binding/InternalBidirectionalBinding.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/binding/InternalUtil.java b/commons/src/main/java/org/apache/isis/core/commons/internal/binding/InternalUtil.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/binding/InternalUtil.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/binding/InternalUtil.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/binding/_BindableAbstract.java b/commons/src/main/java/org/apache/isis/core/commons/internal/binding/_BindableAbstract.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/binding/_BindableAbstract.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/binding/_BindableAbstract.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/binding/_Bindables.java b/commons/src/main/java/org/apache/isis/core/commons/internal/binding/_Bindables.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/binding/_Bindables.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/binding/_Bindables.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/binding/_Observables.java b/commons/src/main/java/org/apache/isis/core/commons/internal/binding/_Observables.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/binding/_Observables.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/binding/_Observables.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/binding/package-info.java b/commons/src/main/java/org/apache/isis/core/commons/internal/binding/package-info.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/binding/package-info.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/binding/package-info.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/codec/_DocumentFactories.java b/commons/src/main/java/org/apache/isis/core/commons/internal/codec/_DocumentFactories.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/codec/_DocumentFactories.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/codec/_DocumentFactories.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/codec/_UrlDecoderUtil.java b/commons/src/main/java/org/apache/isis/core/commons/internal/codec/_UrlDecoderUtil.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/codec/_UrlDecoderUtil.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/codec/_UrlDecoderUtil.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Arrays.java b/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Arrays.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Arrays.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Arrays.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Arrays_Collector.java b/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Arrays_Collector.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Arrays_Collector.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Arrays_Collector.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Arrays_CollectorUnknownSize.java b/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Arrays_CollectorUnknownSize.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Arrays_CollectorUnknownSize.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Arrays_CollectorUnknownSize.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Collections.java b/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Collections.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Collections.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Collections.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Collections_Collector.java b/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Collections_Collector.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Collections_Collector.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Collections_Collector.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Collections_SortedSetOfList.java b/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Collections_SortedSetOfList.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Collections_SortedSetOfList.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Collections_SortedSetOfList.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Inbox.java b/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Inbox.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Inbox.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Inbox.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Lists.java b/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Lists.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Lists.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Lists.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Maps.java b/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Maps.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Maps.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Maps.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Multimaps.java b/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Multimaps.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Multimaps.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Multimaps.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Sets.java b/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Sets.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Sets.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Sets.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Streams.java b/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Streams.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Streams.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Streams.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/package-info.java b/commons/src/main/java/org/apache/isis/core/commons/internal/collections/package-info.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/package-info.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/collections/package-info.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/snapshot/_VersionedList.java b/commons/src/main/java/org/apache/isis/core/commons/internal/collections/snapshot/_VersionedList.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/snapshot/_VersionedList.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/collections/snapshot/_VersionedList.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/compare/_Comparators.java b/commons/src/main/java/org/apache/isis/core/commons/internal/compare/_Comparators.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/compare/_Comparators.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/compare/_Comparators.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/compare/_Comparators_SequenceCompare.java b/commons/src/main/java/org/apache/isis/core/commons/internal/compare/_Comparators_SequenceCompare.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/compare/_Comparators_SequenceCompare.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/compare/_Comparators_SequenceCompare.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/compare/package-info.java b/commons/src/main/java/org/apache/isis/core/commons/internal/compare/package-info.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/compare/package-info.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/compare/package-info.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/concurrent/_ConcurrentContext.java b/commons/src/main/java/org/apache/isis/core/commons/internal/concurrent/_ConcurrentContext.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/concurrent/_ConcurrentContext.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/concurrent/_ConcurrentContext.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/concurrent/_ConcurrentTask.java b/commons/src/main/java/org/apache/isis/core/commons/internal/concurrent/_ConcurrentTask.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/concurrent/_ConcurrentTask.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/concurrent/_ConcurrentTask.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/concurrent/_ConcurrentTaskList.java b/commons/src/main/java/org/apache/isis/core/commons/internal/concurrent/_ConcurrentTaskList.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/concurrent/_ConcurrentTaskList.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/concurrent/_ConcurrentTaskList.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/concurrent/_ThreadSleep.java b/commons/src/main/java/org/apache/isis/core/commons/internal/concurrent/_ThreadSleep.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/concurrent/_ThreadSleep.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/concurrent/_ThreadSleep.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/context/_Context.java b/commons/src/main/java/org/apache/isis/core/commons/internal/context/_Context.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/context/_Context.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/context/_Context.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/context/_Context_ThreadLocal.java b/commons/src/main/java/org/apache/isis/core/commons/internal/context/_Context_ThreadLocal.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/context/_Context_ThreadLocal.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/context/_Context_ThreadLocal.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/context/_Plugin.java b/commons/src/main/java/org/apache/isis/core/commons/internal/context/_Plugin.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/context/_Plugin.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/context/_Plugin.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/context/package-info.java b/commons/src/main/java/org/apache/isis/core/commons/internal/context/package-info.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/context/package-info.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/context/package-info.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/debug/_Probe.java b/commons/src/main/java/org/apache/isis/core/commons/internal/debug/_Probe.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/debug/_Probe.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/debug/_Probe.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/debug/package-info.java b/commons/src/main/java/org/apache/isis/core/commons/internal/debug/package-info.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/debug/package-info.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/debug/package-info.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/environment/DeploymentType.java b/commons/src/main/java/org/apache/isis/core/commons/internal/environment/DeploymentType.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/environment/DeploymentType.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/environment/DeploymentType.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/environment/IsisSystemEnvironment.java b/commons/src/main/java/org/apache/isis/core/commons/internal/environment/IsisSystemEnvironment.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/environment/IsisSystemEnvironment.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/environment/IsisSystemEnvironment.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/exceptions/_Exceptions.java b/commons/src/main/java/org/apache/isis/core/commons/internal/exceptions/_Exceptions.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/exceptions/_Exceptions.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/exceptions/_Exceptions.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/exceptions/package-info.java b/commons/src/main/java/org/apache/isis/core/commons/internal/exceptions/package-info.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/exceptions/package-info.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/exceptions/package-info.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/factory/InstanceCreationClassException.java b/commons/src/main/java/org/apache/isis/core/commons/internal/factory/InstanceCreationClassException.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/factory/InstanceCreationClassException.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/factory/InstanceCreationClassException.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/factory/InstanceCreationException.java b/commons/src/main/java/org/apache/isis/core/commons/internal/factory/InstanceCreationException.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/factory/InstanceCreationException.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/factory/InstanceCreationException.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/factory/InstanceUtil.java b/commons/src/main/java/org/apache/isis/core/commons/internal/factory/InstanceUtil.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/factory/InstanceUtil.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/factory/InstanceUtil.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/factory/UnavailableClassException.java b/commons/src/main/java/org/apache/isis/core/commons/internal/factory/UnavailableClassException.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/factory/UnavailableClassException.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/factory/UnavailableClassException.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/factory/package-info.java b/commons/src/main/java/org/apache/isis/core/commons/internal/factory/package-info.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/factory/package-info.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/factory/package-info.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/functions/_Functions.java b/commons/src/main/java/org/apache/isis/core/commons/internal/functions/_Functions.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/functions/_Functions.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/functions/_Functions.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/functions/_Functions_IndexAwareFunctionAdapter.java b/commons/src/main/java/org/apache/isis/core/commons/internal/functions/_Functions_IndexAwareFunctionAdapter.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/functions/_Functions_IndexAwareFunctionAdapter.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/functions/_Functions_IndexAwareFunctionAdapter.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/functions/_Predicates.java b/commons/src/main/java/org/apache/isis/core/commons/internal/functions/_Predicates.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/functions/_Predicates.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/functions/_Predicates.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/functions/package-info.java b/commons/src/main/java/org/apache/isis/core/commons/internal/functions/package-info.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/functions/package-info.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/functions/package-info.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/hash/_Hashes.java b/commons/src/main/java/org/apache/isis/core/commons/internal/hash/_Hashes.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/hash/_Hashes.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/hash/_Hashes.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/IocContainer.java b/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/IocContainer.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/IocContainer.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/ioc/IocContainer.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/ManagedBeanAdapter.java b/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/ManagedBeanAdapter.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/ManagedBeanAdapter.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/ioc/ManagedBeanAdapter.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/PriorityConstants.java b/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/PriorityConstants.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/PriorityConstants.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/ioc/PriorityConstants.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/cdi/BeanAdapterCDI.java b/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/cdi/BeanAdapterCDI.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/cdi/BeanAdapterCDI.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/ioc/cdi/BeanAdapterCDI.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/cdi/CdiPlugin.java b/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/cdi/CdiPlugin.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/cdi/CdiPlugin.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/ioc/cdi/CdiPlugin.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/cdi/_CDI.java b/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/cdi/_CDI.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/cdi/_CDI.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/ioc/cdi/_CDI.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/cdi/_CDI_Lifecycle.java b/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/cdi/_CDI_Lifecycle.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/cdi/_CDI_Lifecycle.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/ioc/cdi/_CDI_Lifecycle.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/spring/BeanAdapterSpring.java b/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/spring/BeanAdapterSpring.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/spring/BeanAdapterSpring.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/ioc/spring/BeanAdapterSpring.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/spring/EventSpring.java b/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/spring/EventSpring.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/spring/EventSpring.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/ioc/spring/EventSpring.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/spring/IocContainerSpring.java b/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/spring/IocContainerSpring.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/spring/IocContainerSpring.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/ioc/spring/IocContainerSpring.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/spring/_Spring.java b/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/spring/_Spring.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/spring/_Spring.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/ioc/spring/_Spring.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/memento/_Mementos.java b/commons/src/main/java/org/apache/isis/core/commons/internal/memento/_Mementos.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/memento/_Mementos.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/memento/_Mementos.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/memento/_Mementos_MementoDefault.java b/commons/src/main/java/org/apache/isis/core/commons/internal/memento/_Mementos_MementoDefault.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/memento/_Mementos_MementoDefault.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/memento/_Mementos_MementoDefault.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/memento/package-info.java b/commons/src/main/java/org/apache/isis/core/commons/internal/memento/package-info.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/memento/package-info.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/memento/package-info.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/package-info.java b/commons/src/main/java/org/apache/isis/core/commons/internal/package-info.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/package-info.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/package-info.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/plugins/PluginResolveException.java b/commons/src/main/java/org/apache/isis/core/commons/internal/plugins/PluginResolveException.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/plugins/PluginResolveException.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/plugins/PluginResolveException.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/plugins/codegen/ProxyFactory.java b/commons/src/main/java/org/apache/isis/core/commons/internal/plugins/codegen/ProxyFactory.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/plugins/codegen/ProxyFactory.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/plugins/codegen/ProxyFactory.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/plugins/codegen/ProxyFactoryService.java b/commons/src/main/java/org/apache/isis/core/commons/internal/plugins/codegen/ProxyFactoryService.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/plugins/codegen/ProxyFactoryService.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/plugins/codegen/ProxyFactoryService.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/plugins/codegen/ProxyFactoryServiceAbstract.java b/commons/src/main/java/org/apache/isis/core/commons/internal/plugins/codegen/ProxyFactoryServiceAbstract.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/plugins/codegen/ProxyFactoryServiceAbstract.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/plugins/codegen/ProxyFactoryServiceAbstract.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/plugins/ioc/ConversationContextHandle.java b/commons/src/main/java/org/apache/isis/core/commons/internal/plugins/ioc/ConversationContextHandle.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/plugins/ioc/ConversationContextHandle.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/plugins/ioc/ConversationContextHandle.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/plugins/ioc/ConversationContextService.java b/commons/src/main/java/org/apache/isis/core/commons/internal/plugins/ioc/ConversationContextService.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/plugins/ioc/ConversationContextService.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/plugins/ioc/ConversationContextService.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/plugins/ioc/ConversationContextServiceDefault.java b/commons/src/main/java/org/apache/isis/core/commons/internal/plugins/ioc/ConversationContextServiceDefault.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/plugins/ioc/ConversationContextServiceDefault.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/plugins/ioc/ConversationContextServiceDefault.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/primitives/_Ints.java b/commons/src/main/java/org/apache/isis/core/commons/internal/primitives/_Ints.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/primitives/_Ints.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/primitives/_Ints.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/primitives/_Longs.java b/commons/src/main/java/org/apache/isis/core/commons/internal/primitives/_Longs.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/primitives/_Longs.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/primitives/_Longs.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/reflection/_Annotations.java b/commons/src/main/java/org/apache/isis/core/commons/internal/reflection/_Annotations.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/reflection/_Annotations.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/reflection/_Annotations.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/reflection/_AnnotationsLegacy.java b/commons/src/main/java/org/apache/isis/core/commons/internal/reflection/_AnnotationsLegacy.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/reflection/_AnnotationsLegacy.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/reflection/_AnnotationsLegacy.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/reflection/_Annotations_AttributeMethods.java b/commons/src/main/java/org/apache/isis/core/commons/internal/reflection/_Annotations_AttributeMethods.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/reflection/_Annotations_AttributeMethods.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/reflection/_Annotations_AttributeMethods.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/reflection/_Annotations_SyntCache.java b/commons/src/main/java/org/apache/isis/core/commons/internal/reflection/_Annotations_SyntCache.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/reflection/_Annotations_SyntCache.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/reflection/_Annotations_SyntCache.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/reflection/_Annotations_SynthesizedMergedAnnotationInvocationHandler.java b/commons/src/main/java/org/apache/isis/core/commons/internal/reflection/_Annotations_SynthesizedMergedAnnotationInvocationHandler.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/reflection/_Annotations_SynthesizedMergedAnnotationInvocationHandler.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/reflection/_Annotations_SynthesizedMergedAnnotationInvocationHandler.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/reflection/_MethodCache.java b/commons/src/main/java/org/apache/isis/core/commons/internal/reflection/_MethodCache.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/reflection/_MethodCache.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/reflection/_MethodCache.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/reflection/_Reflect.java b/commons/src/main/java/org/apache/isis/core/commons/internal/reflection/_Reflect.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/reflection/_Reflect.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/reflection/_Reflect.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/reflection/package-info.java b/commons/src/main/java/org/apache/isis/core/commons/internal/reflection/package-info.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/reflection/package-info.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/reflection/package-info.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/resources/_Json.java b/commons/src/main/java/org/apache/isis/core/commons/internal/resources/_Json.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/resources/_Json.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/resources/_Json.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/resources/_Resources.java b/commons/src/main/java/org/apache/isis/core/commons/internal/resources/_Resources.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/resources/_Resources.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/resources/_Resources.java
diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/resources/package-info.java b/commons/src/main/java/org/apache/isis/core/commons/internal/resources/package-info.java
similarity index 100%
rename from core/commons/src/main/java/org/apache/isis/core/commons/internal/resources/package-info.java
rename to commons/src/main/java/org/apache/isis/core/commons/internal/resources/package-info.java
diff --git a/core/commons/src/test/java/org/apache/isis/core/commons/SerializationTester.java b/commons/src/test/java/org/apache/isis/core/commons/SerializationTester.java
similarity index 100%
rename from core/commons/src/test/java/org/apache/isis/core/commons/SerializationTester.java
rename to commons/src/test/java/org/apache/isis/core/commons/SerializationTester.java
diff --git a/core/commons/src/test/java/org/apache/isis/core/commons/collections/CanTest.java b/commons/src/test/java/org/apache/isis/core/commons/collections/CanTest.java
similarity index 100%
rename from core/commons/src/test/java/org/apache/isis/core/commons/collections/CanTest.java
rename to commons/src/test/java/org/apache/isis/core/commons/collections/CanTest.java
diff --git a/core/commons/src/test/java/org/apache/isis/core/commons/collections/CanVectorTest.java b/commons/src/test/java/org/apache/isis/core/commons/collections/CanVectorTest.java
similarity index 100%
rename from core/commons/src/test/java/org/apache/isis/core/commons/collections/CanVectorTest.java
rename to commons/src/test/java/org/apache/isis/core/commons/collections/CanVectorTest.java
diff --git a/core/commons/src/test/java/org/apache/isis/core/commons/handlers/ChainOfResponsibilityTest.java b/commons/src/test/java/org/apache/isis/core/commons/handlers/ChainOfResponsibilityTest.java
similarity index 100%
rename from core/commons/src/test/java/org/apache/isis/core/commons/handlers/ChainOfResponsibilityTest.java
rename to commons/src/test/java/org/apache/isis/core/commons/handlers/ChainOfResponsibilityTest.java
diff --git a/core/commons/src/test/java/org/apache/isis/core/commons/internal/base/BytesTest.java b/commons/src/test/java/org/apache/isis/core/commons/internal/base/BytesTest.java
similarity index 100%
rename from core/commons/src/test/java/org/apache/isis/core/commons/internal/base/BytesTest.java
rename to commons/src/test/java/org/apache/isis/core/commons/internal/base/BytesTest.java
diff --git a/core/commons/src/test/java/org/apache/isis/core/commons/internal/base/NullSafeTest.java b/commons/src/test/java/org/apache/isis/core/commons/internal/base/NullSafeTest.java
similarity index 100%
rename from core/commons/src/test/java/org/apache/isis/core/commons/internal/base/NullSafeTest.java
rename to commons/src/test/java/org/apache/isis/core/commons/internal/base/NullSafeTest.java
diff --git a/core/commons/src/test/java/org/apache/isis/core/commons/internal/base/ReductionTest.java b/commons/src/test/java/org/apache/isis/core/commons/internal/base/ReductionTest.java
similarity index 100%
rename from core/commons/src/test/java/org/apache/isis/core/commons/internal/base/ReductionTest.java
rename to commons/src/test/java/org/apache/isis/core/commons/internal/base/ReductionTest.java
diff --git a/core/commons/src/test/java/org/apache/isis/core/commons/internal/base/StringsTest.java b/commons/src/test/java/org/apache/isis/core/commons/internal/base/StringsTest.java
similarity index 100%
rename from core/commons/src/test/java/org/apache/isis/core/commons/internal/base/StringsTest.java
rename to commons/src/test/java/org/apache/isis/core/commons/internal/base/StringsTest.java
diff --git a/core/commons/src/test/java/org/apache/isis/core/commons/internal/binding/BindableTest.java b/commons/src/test/java/org/apache/isis/core/commons/internal/binding/BindableTest.java
similarity index 100%
rename from core/commons/src/test/java/org/apache/isis/core/commons/internal/binding/BindableTest.java
rename to commons/src/test/java/org/apache/isis/core/commons/internal/binding/BindableTest.java
diff --git a/core/commons/src/test/java/org/apache/isis/core/commons/internal/cdi/CDITest.java b/commons/src/test/java/org/apache/isis/core/commons/internal/cdi/CDITest.java
similarity index 100%
rename from core/commons/src/test/java/org/apache/isis/core/commons/internal/cdi/CDITest.java
rename to commons/src/test/java/org/apache/isis/core/commons/internal/cdi/CDITest.java
diff --git a/core/commons/src/test/java/org/apache/isis/core/commons/internal/cdi/ValidQualifierForTesting.java b/commons/src/test/java/org/apache/isis/core/commons/internal/cdi/ValidQualifierForTesting.java
similarity index 100%
rename from core/commons/src/test/java/org/apache/isis/core/commons/internal/cdi/ValidQualifierForTesting.java
rename to commons/src/test/java/org/apache/isis/core/commons/internal/cdi/ValidQualifierForTesting.java
diff --git a/core/commons/src/test/java/org/apache/isis/core/commons/internal/collections/Samples.java b/commons/src/test/java/org/apache/isis/core/commons/internal/collections/Samples.java
similarity index 100%
rename from core/commons/src/test/java/org/apache/isis/core/commons/internal/collections/Samples.java
rename to commons/src/test/java/org/apache/isis/core/commons/internal/collections/Samples.java
diff --git a/core/commons/src/test/java/org/apache/isis/core/commons/internal/collections/_ArraysTest.java b/commons/src/test/java/org/apache/isis/core/commons/internal/collections/_ArraysTest.java
similarity index 100%
rename from core/commons/src/test/java/org/apache/isis/core/commons/internal/collections/_ArraysTest.java
rename to commons/src/test/java/org/apache/isis/core/commons/internal/collections/_ArraysTest.java
diff --git a/core/commons/src/test/java/org/apache/isis/core/commons/internal/collections/_MapsTest.java b/commons/src/test/java/org/apache/isis/core/commons/internal/collections/_MapsTest.java
similarity index 100%
rename from core/commons/src/test/java/org/apache/isis/core/commons/internal/collections/_MapsTest.java
rename to commons/src/test/java/org/apache/isis/core/commons/internal/collections/_MapsTest.java
diff --git a/core/commons/src/test/java/org/apache/isis/core/commons/internal/collections/_SetsTest.java b/commons/src/test/java/org/apache/isis/core/commons/internal/collections/_SetsTest.java
similarity index 100%
rename from core/commons/src/test/java/org/apache/isis/core/commons/internal/collections/_SetsTest.java
rename to commons/src/test/java/org/apache/isis/core/commons/internal/collections/_SetsTest.java
diff --git a/core/commons/src/test/java/org/apache/isis/core/commons/internal/collections/snapshot/VersionedListTest.java b/commons/src/test/java/org/apache/isis/core/commons/internal/collections/snapshot/VersionedListTest.java
similarity index 100%
rename from core/commons/src/test/java/org/apache/isis/core/commons/internal/collections/snapshot/VersionedListTest.java
rename to commons/src/test/java/org/apache/isis/core/commons/internal/collections/snapshot/VersionedListTest.java
diff --git a/core/commons/src/test/java/org/apache/isis/core/commons/internal/compare/ComparatorsTest.java b/commons/src/test/java/org/apache/isis/core/commons/internal/compare/ComparatorsTest.java
similarity index 100%
rename from core/commons/src/test/java/org/apache/isis/core/commons/internal/compare/ComparatorsTest.java
rename to commons/src/test/java/org/apache/isis/core/commons/internal/compare/ComparatorsTest.java
diff --git a/core/commons/src/test/java/org/apache/isis/core/commons/internal/concurrent/ConcurrentTaskListTest.java b/commons/src/test/java/org/apache/isis/core/commons/internal/concurrent/ConcurrentTaskListTest.java
similarity index 100%
rename from core/commons/src/test/java/org/apache/isis/core/commons/internal/concurrent/ConcurrentTaskListTest.java
rename to commons/src/test/java/org/apache/isis/core/commons/internal/concurrent/ConcurrentTaskListTest.java
diff --git a/core/commons/src/test/java/org/apache/isis/core/commons/internal/context/ContextTest.java b/commons/src/test/java/org/apache/isis/core/commons/internal/context/ContextTest.java
similarity index 100%
rename from core/commons/src/test/java/org/apache/isis/core/commons/internal/context/ContextTest.java
rename to commons/src/test/java/org/apache/isis/core/commons/internal/context/ContextTest.java
diff --git a/core/commons/src/test/java/org/apache/isis/core/commons/internal/primitives/IntsTest.java b/commons/src/test/java/org/apache/isis/core/commons/internal/primitives/IntsTest.java
similarity index 100%
rename from core/commons/src/test/java/org/apache/isis/core/commons/internal/primitives/IntsTest.java
rename to commons/src/test/java/org/apache/isis/core/commons/internal/primitives/IntsTest.java
diff --git a/core/commons/src/test/java/org/apache/isis/core/commons/internal/resources/ResourcesTest.java b/commons/src/test/java/org/apache/isis/core/commons/internal/resources/ResourcesTest.java
similarity index 100%
rename from core/commons/src/test/java/org/apache/isis/core/commons/internal/resources/ResourcesTest.java
rename to commons/src/test/java/org/apache/isis/core/commons/internal/resources/ResourcesTest.java
diff --git a/core/commons/src/test/java/org/apache/isis/core/commons/internal/strings/FormatTest.java b/commons/src/test/java/org/apache/isis/core/commons/internal/strings/FormatTest.java
similarity index 100%
rename from core/commons/src/test/java/org/apache/isis/core/commons/internal/strings/FormatTest.java
rename to commons/src/test/java/org/apache/isis/core/commons/internal/strings/FormatTest.java
diff --git a/core/codegen-bytebuddy/build.gradle b/core/codegen-bytebuddy/build.gradle
index 7aa50df..9eaac6c 100644
--- a/core/codegen-bytebuddy/build.gradle
+++ b/core/codegen-bytebuddy/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'war'
 dependencies {
     compile (Libs.byteBuddy)
     compile (Libs.objenesis)
-    compile project(':isis-parent:isis:isis-core-commons')
+    compile project(':isis-parent:isis:isis-commons')
     testCompile(Libs.jmockJunit4) {
         exclude(module: 'junit-dep')
         exclude(module: 'byte-buddy')
diff --git a/core/codegen-bytebuddy/pom.xml b/core/codegen-bytebuddy/pom.xml
index 1967bc9..2b4b75e 100644
--- a/core/codegen-bytebuddy/pom.xml
+++ b/core/codegen-bytebuddy/pom.xml
@@ -16,7 +16,7 @@
 
 	<parent>
 		<groupId>org.apache.isis.core</groupId>
-		<artifactId>isis</artifactId>
+		<artifactId>isis-core</artifactId>
 		<version>2.0.0-SNAPSHOT</version>
 	</parent>
 
@@ -68,8 +68,8 @@
 		</dependency>
 	
 		<dependency>
-			<groupId>org.apache.isis.core</groupId>
-			<artifactId>isis-core-commons</artifactId>
+			<groupId>org.apache.isis.commons</groupId>
+			<artifactId>isis-commons</artifactId>
 			<scope>compile</scope>
 		</dependency>
 
diff --git a/core/config/build.gradle b/core/config/build.gradle
index 14c8ad5..022e5e5 100644
--- a/core/config/build.gradle
+++ b/core/config/build.gradle
@@ -20,7 +20,7 @@ sourceSets {
 
 dependencies {
     compile project(':isis-parent:isis-applib')
-    compile project(':isis-parent:isis:isis-core-commons')
+    compile project(':isis-parent:isis:isis-commons')
     compile (Libs.hibernateValidator)
     compile (Libs.springBootConfigurationProcessor)
     testCompile project(':isis-parent:isis:isis-core-internaltestsupport')
diff --git a/core/config/pom.xml b/core/config/pom.xml
index 41b2a55..e318397 100644
--- a/core/config/pom.xml
+++ b/core/config/pom.xml
@@ -22,7 +22,7 @@
 
     <parent>
         <groupId>org.apache.isis.core</groupId>
-        <artifactId>isis</artifactId>
+        <artifactId>isis-core</artifactId>
         <version>2.0.0-SNAPSHOT</version>
     </parent>
 
@@ -64,8 +64,8 @@
             <artifactId>isis-applib</artifactId>
         </dependency>
     	<dependency>
-            <groupId>org.apache.isis.core</groupId>
-            <artifactId>isis-core-commons</artifactId>
+            <groupId>org.apache.isis.commons</groupId>
+			<artifactId>isis-commons</artifactId>
         </dependency>
 
         <dependency>
diff --git a/core/internaltestsupport/build.gradle b/core/internaltestsupport/build.gradle
index 89e8cca..d1b30e5 100644
--- a/core/internaltestsupport/build.gradle
+++ b/core/internaltestsupport/build.gradle
@@ -2,7 +2,7 @@ description = 'Apache Isis Core - Unit Test Support'
 apply plugin: 'war'
 
 dependencies {
-    compile project(':isis-parent:isis:isis-core-commons')
+    compile project(':isis-parent:isis:isis-commons')
     compile(Libs.junitJupiterApi)
     compile(Libs.junitJupiterEngine)
     compile(Libs.junitVintageEngine)
diff --git a/core/internaltestsupport/pom.xml b/core/internaltestsupport/pom.xml
index 1286091..067b00f 100644
--- a/core/internaltestsupport/pom.xml
+++ b/core/internaltestsupport/pom.xml
@@ -16,7 +16,7 @@
 
 	<parent>
 		<groupId>org.apache.isis.core</groupId>
-		<artifactId>isis</artifactId>
+		<artifactId>isis-core</artifactId>
 		<version>2.0.0-SNAPSHOT</version>
 	</parent>
 
@@ -35,8 +35,8 @@
 	<dependencies>
 
 		<dependency>
-			<groupId>org.apache.isis.core</groupId>
-			<artifactId>isis-core-commons</artifactId>
+			<groupId>org.apache.isis.commons</groupId>
+			<artifactId>isis-commons</artifactId>
 		</dependency>
 
 		<dependency>
diff --git a/core/metamodel/build.gradle b/core/metamodel/build.gradle
index 4876d61..2d70f2c 100644
--- a/core/metamodel/build.gradle
+++ b/core/metamodel/build.gradle
@@ -34,7 +34,7 @@ dependencies {
         exclude(module: 'slf4j-api')
         exclude(module: 'commons-lang3')
     }
-    compile project(':isis-parent:isis:isis-core-commons')
+    compile project(':isis-parent:isis:isis-commons')
 
     testCompile project(':isis-parent:isis:isis-core-internaltestsupport')
 
diff --git a/core/metamodel/pom.xml b/core/metamodel/pom.xml
index e09f3e8..917556e 100644
--- a/core/metamodel/pom.xml
+++ b/core/metamodel/pom.xml
@@ -22,7 +22,7 @@
 
     <parent>
         <groupId>org.apache.isis.core</groupId>
-        <artifactId>isis</artifactId>
+        <artifactId>isis-core</artifactId>
         <version>2.0.0-SNAPSHOT</version>
     </parent>
 
diff --git a/core/pom.xml b/core/pom.xml
index fbb889d..a110a71 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -15,13 +15,14 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.apache.isis.core</groupId>
+		<groupId>org.apache.isis</groupId>
 		<artifactId>isis-parent</artifactId>
 		<version>2.0.0-SNAPSHOT</version>
 		<relativePath>../isis-parent/pom.xml</relativePath>
 	</parent>
 
-	<artifactId>isis</artifactId>
+	<groupId>org.apache.isis.core</groupId>
+	<artifactId>isis-core</artifactId>
 
 	<packaging>pom</packaging>
 
@@ -693,8 +694,8 @@
 			<!-- CHILD MODULES -->
 			<!-- for benefit of application developers, using scope=import, type=pom -->
 			<dependency>
-				<groupId>org.apache.isis.core</groupId>
-				<artifactId>isis-core-commons</artifactId>
+				<groupId>org.apache.isis.commons</groupId>
+				<artifactId>isis-commons</artifactId>
 				<version>2.0.0-SNAPSHOT</version>
 			</dependency>
 			<dependency>
@@ -1810,11 +1811,12 @@
 	
 		<module>../supplemental-model</module>
 
+		<module>../commons</module>
+
 		<module>../api/schema</module>
 		<module>../api/applib</module>
 
 		<module>codegen-bytebuddy</module>
-		<module>commons</module>
 		<module>config</module>
 		<module>internaltestsupport</module>
 		<module>metamodel</module>
@@ -1822,7 +1824,6 @@
 		<module>runtimeservices</module>
 		<module>webapp</module>
 
-
 		<module>security</module>
 		<module>../security/bypass</module>
 		<module>../security/shiro</module>
diff --git a/core/runtime/pom.xml b/core/runtime/pom.xml
index ef62818..0a6e2f9 100644
--- a/core/runtime/pom.xml
+++ b/core/runtime/pom.xml
@@ -22,7 +22,7 @@
 
     <parent>
         <groupId>org.apache.isis.core</groupId>
-        <artifactId>isis</artifactId>
+        <artifactId>isis-core</artifactId>
         <version>2.0.0-SNAPSHOT</version>
     </parent>
 
diff --git a/core/runtimeservices/pom.xml b/core/runtimeservices/pom.xml
index 1db054f..433c236 100644
--- a/core/runtimeservices/pom.xml
+++ b/core/runtimeservices/pom.xml
@@ -22,7 +22,7 @@
 
     <parent>
         <groupId>org.apache.isis.core</groupId>
-        <artifactId>isis</artifactId>
+        <artifactId>isis-core</artifactId>
         <version>2.0.0-SNAPSHOT</version>
     </parent>
 
diff --git a/core/security/pom.xml b/core/security/pom.xml
index 854664e..8b09f89 100644
--- a/core/security/pom.xml
+++ b/core/security/pom.xml
@@ -22,7 +22,7 @@
 
     <parent>
         <groupId>org.apache.isis.core</groupId>
-        <artifactId>isis</artifactId>
+        <artifactId>isis-core</artifactId>
         <version>2.0.0-SNAPSHOT</version>
     </parent>
 
diff --git a/core/webapp/pom.xml b/core/webapp/pom.xml
index 5e39f13..65dad73 100644
--- a/core/webapp/pom.xml
+++ b/core/webapp/pom.xml
@@ -16,7 +16,7 @@
 
 	<parent>
 		<groupId>org.apache.isis.core</groupId>
-		<artifactId>isis</artifactId>
+		<artifactId>isis-core</artifactId>
 		<version>2.0.0-SNAPSHOT</version>
 	</parent>
 
diff --git a/examples/demo/domain/build.gradle b/examples/demo/domain/build.gradle
index b05f7b1..405e4cc 100644
--- a/examples/demo/domain/build.gradle
+++ b/examples/demo/domain/build.gradle
@@ -3,7 +3,7 @@ description = 'Apache Isis App - Demo (Domain)'
 
 dependencies {
     compile project(':isis-parent:isis-applib')
-    compile project(':isis-parent:isis:isis-core-commons')
+    compile project(':isis-parent:isis:isis-commons')
     compile project(':isis-parent:isis:isis-testing:isis-testing-fixtures:isis-testing-fixtures-applib')
     compile project(':isis-parent:isis:isis-valuetypes:isis-valuetypes-asciidoc:isis-valuetypes-asciidoc-applib')
     compile project(':isis-parent:isis:isis-valuetypes:isis-valuetypes-markdown:isis-valuetypes-markdown-applib')
diff --git a/examples/demo/wicket/build.gradle b/examples/demo/wicket/build.gradle
index 14d27e0..ace488b 100644
--- a/examples/demo/wicket/build.gradle
+++ b/examples/demo/wicket/build.gradle
@@ -3,7 +3,7 @@ description = 'Apache Isis App - Demo (Wicket)'
 
 dependencies {
     compile project(':isis-parent:isis-applib')
-    compile project(':isis-parent:isis:isis-core-commons')
+    compile project(':isis-parent:isis:isis-commons')
     compile project(':isis-app-starter-parent:demo-parent:demo-domain')
     compile project(':isis-parent:isis:isis-valuetypes:isis-valuetypes-markdown:isis-valuetypes-markdown-applib')
     compile project(':isis-parent:isis:isis-valuetypes:isis-valuetypes-markdown:isis-valuetypes-markdown-ui')
diff --git a/extensions/pom.xml b/extensions/pom.xml
index c67e3d7..99aa6ee 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -16,7 +16,7 @@
 
 	<parent>
 		<groupId>org.apache.isis.core</groupId>
-		<artifactId>isis</artifactId>
+		<artifactId>isis-core</artifactId>
 		<version>2.0.0-SNAPSHOT</version>
 		<relativePath>../core/pom.xml</relativePath>
 	</parent>
diff --git a/extensions/security/secman/api/build.gradle b/extensions/security/secman/api/build.gradle
index 9c3666e..f0d50f9 100644
--- a/extensions/security/secman/api/build.gradle
+++ b/extensions/security/secman/api/build.gradle
@@ -3,7 +3,7 @@ description = 'Apache Isis Ext - Sec Man API'
 apply plugin: 'war'
 
 dependencies {
-    compile project(':isis-parent:isis:isis-core-commons')
+    compile project(':isis-parent:isis:isis-commons')
     compile project(':isis-parent:isis-applib')
     compile project(':isis-parent:isis:isis-extensions:isis-extensions-secman')
     compile project(':isis-parent:isis:isis-core-metamodel')
diff --git a/incubator/pom.xml b/incubator/pom.xml
index 76931a6..b8c31fa 100644
--- a/incubator/pom.xml
+++ b/incubator/pom.xml
@@ -16,7 +16,7 @@
 
 	<parent>
 		<groupId>org.apache.isis.core</groupId>
-		<artifactId>isis</artifactId>
+		<artifactId>isis-core</artifactId>
 		<version>2.0.0-SNAPSHOT</version>
 		<relativePath>../core/pom.xml</relativePath>
 	</parent>
diff --git a/isis-parent/pom.xml b/isis-parent/pom.xml
index 40d468c..9826550 100644
--- a/isis-parent/pom.xml
+++ b/isis-parent/pom.xml
@@ -49,7 +49,7 @@ under the License.
 		<relativePath/>
 	</parent>
 
-	<groupId>org.apache.isis.core</groupId>
+	<groupId>org.apache.isis</groupId>
 	<artifactId>isis-parent</artifactId>
 	<version>2.0.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
diff --git a/legacy/mappings/restclient/build.gradle b/legacy/mappings/restclient/build.gradle
index c48e6ee..c8cb493 100644
--- a/legacy/mappings/restclient/build.gradle
+++ b/legacy/mappings/restclient/build.gradle
@@ -4,7 +4,7 @@ apply plugin: 'war'
 dependencies {
     compile project(':isis-parent:isis:isis-viewer-restfulobjects:isis-viewer-restfulobjects-applib')
     testCompile project(':isis-parent:isis:isis-core-internaltestsupport')
-    providedCompile project(':isis-parent:isis:isis-core-commons')
+    providedCompile project(':isis-parent:isis:isis-commons')
 }
 
 task packageTests(type: Jar) {
diff --git a/legacy/mappings/restclient/pom.xml b/legacy/mappings/restclient/pom.xml
index 6707469..9ad73fa 100644
--- a/legacy/mappings/restclient/pom.xml
+++ b/legacy/mappings/restclient/pom.xml
@@ -40,8 +40,8 @@
 		</dependency>
 
         <dependency>
-            <groupId>org.apache.isis.core</groupId>
-            <artifactId>isis-core-commons</artifactId>
+            <groupId>org.apache.isis.commons</groupId>
+			<artifactId>isis-commons</artifactId>
             <scope>provided</scope>
         </dependency>
 
diff --git a/legacy/pom.xml b/legacy/pom.xml
index 5a5e335..a4d5f57 100644
--- a/legacy/pom.xml
+++ b/legacy/pom.xml
@@ -16,7 +16,7 @@
 
 	<parent>
 		<groupId>org.apache.isis.core</groupId>
-		<artifactId>isis</artifactId>
+		<artifactId>isis-core</artifactId>
 		<version>2.0.0-SNAPSHOT</version>
 		<relativePath>../core/pom.xml</relativePath>
 	</parent>
diff --git a/mappings/pom.xml b/mappings/pom.xml
index c045fc2..4b596b0 100644
--- a/mappings/pom.xml
+++ b/mappings/pom.xml
@@ -16,7 +16,7 @@
 
 	<parent>
 		<groupId>org.apache.isis.core</groupId>
-		<artifactId>isis</artifactId>
+		<artifactId>isis-core</artifactId>
 		<version>2.0.0-SNAPSHOT</version>
 		<relativePath>../core/pom.xml</relativePath>
 	</parent>
diff --git a/mappings/restclient/api/build.gradle b/mappings/restclient/api/build.gradle
index ec2b8aa..d4dc804 100644
--- a/mappings/restclient/api/build.gradle
+++ b/mappings/restclient/api/build.gradle
@@ -2,7 +2,7 @@ group = 'org.apache.isis.mappings'
 description = 'Apache Isis Ext - REST Client'
 dependencies {
     compile project(':isis-parent:isis-applib')
-    compile project(':isis-parent:isis:isis-core-commons')
+    compile project(':isis-parent:isis:isis-commons')
     compile (Libs.springContext)
 }
 
diff --git a/mappings/restclient/api/pom.xml b/mappings/restclient/api/pom.xml
index 9232b57..0fcd857 100644
--- a/mappings/restclient/api/pom.xml
+++ b/mappings/restclient/api/pom.xml
@@ -37,8 +37,8 @@
 			<artifactId>isis-applib</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.apache.isis.core</groupId>
-			<artifactId>isis-core-commons</artifactId>
+			<groupId>org.apache.isis.commons</groupId>
+			<artifactId>isis-commons</artifactId>
 		</dependency>
 
 		<dependency>
diff --git a/mavendeps/pom.xml b/mavendeps/pom.xml
index 1b15fe1..ca5cfbd 100644
--- a/mavendeps/pom.xml
+++ b/mavendeps/pom.xml
@@ -16,7 +16,7 @@
 
 	<parent>
 		<groupId>org.apache.isis.core</groupId>
-		<artifactId>isis</artifactId>
+		<artifactId>isis-core</artifactId>
 		<version>2.0.0-SNAPSHOT</version>
 		<relativePath>../core/pom.xml</relativePath>
 	</parent>
@@ -72,7 +72,7 @@
 
 			<dependency>
 				<groupId>org.apache.isis.core</groupId>
-				<artifactId>isis</artifactId>
+				<artifactId>isis-core</artifactId>
 				<version>2.0.0-SNAPSHOT</version>
 				<type>pom</type>
 				<scope>import</scope>
diff --git a/persistence/jdo/applib/build.gradle b/persistence/jdo/applib/build.gradle
index 5185456..b32c2cf 100644
--- a/persistence/jdo/applib/build.gradle
+++ b/persistence/jdo/applib/build.gradle
@@ -2,7 +2,7 @@ group = 'org.apache.isis.persistence'
 description = 'Apache Isis Persistence - JDO (applib)'
 dependencies {
     compile project(':isis-parent:isis-applib')
-    compile project(':isis-parent:isis:isis-core-commons')
+    compile project(':isis-parent:isis:isis-commons')
     compile(Libs.javaxJdo)
     compile(Libs.datanucleusRdbms)
 }
diff --git a/persistence/jdo/applib/pom.xml b/persistence/jdo/applib/pom.xml
index fa7f525..ea038f6 100644
--- a/persistence/jdo/applib/pom.xml
+++ b/persistence/jdo/applib/pom.xml
@@ -73,8 +73,8 @@
 			<artifactId>isis-applib</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.apache.isis.core</groupId>
-			<artifactId>isis-core-commons</artifactId>
+			<groupId>org.apache.isis.commons</groupId>
+			<artifactId>isis-commons</artifactId>
 		</dependency>
 
 		<!-- JDO API (providing compile dependency) -->
diff --git a/persistence/jdo/pom.xml b/persistence/jdo/pom.xml
index 1ed9313..16db8a5 100644
--- a/persistence/jdo/pom.xml
+++ b/persistence/jdo/pom.xml
@@ -15,7 +15,7 @@
 
 	<parent>
 		<groupId>org.apache.isis.core</groupId>
-		<artifactId>isis</artifactId>
+		<artifactId>isis-core</artifactId>
 		<version>2.0.0-SNAPSHOT</version>
 		<relativePath>../../core/pom.xml</relativePath>
 	</parent>
diff --git a/persistence/jpa/applib/build.gradle b/persistence/jpa/applib/build.gradle
index c2a88e3..3e2442e 100644
--- a/persistence/jpa/applib/build.gradle
+++ b/persistence/jpa/applib/build.gradle
@@ -2,7 +2,7 @@ group = 'org.apache.isis.persistence'
 description = 'Apache Isis Persistence - JPA (applib)'
 dependencies {
     compile project(':isis-parent:isis-applib')
-    compile project(':isis-parent:isis:isis-core-commons')
+    compile project(':isis-parent:isis:isis-commons')
 }
 
 task packageTests(type: Jar) {
diff --git a/persistence/jpa/applib/pom.xml b/persistence/jpa/applib/pom.xml
index 51d8a1b..a07b8f0 100644
--- a/persistence/jpa/applib/pom.xml
+++ b/persistence/jpa/applib/pom.xml
@@ -73,8 +73,8 @@
 			<artifactId>isis-applib</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.apache.isis.core</groupId>
-			<artifactId>isis-core-commons</artifactId>
+			<groupId>org.apache.isis.commons</groupId>
+			<artifactId>isis-commons</artifactId>
 		</dependency>
 
 		<!-- TODO JPA API (providing compile dependency) -->
diff --git a/persistence/jpa/pom.xml b/persistence/jpa/pom.xml
index 60ea3a3..549d244 100644
--- a/persistence/jpa/pom.xml
+++ b/persistence/jpa/pom.xml
@@ -15,7 +15,7 @@
 
 	<parent>
 		<groupId>org.apache.isis.core</groupId>
-		<artifactId>isis</artifactId>
+		<artifactId>isis-core</artifactId>
 		<version>2.0.0-SNAPSHOT</version>
 		<relativePath>../../core/pom.xml</relativePath>
 	</parent>
diff --git a/security/bypass/pom.xml b/security/bypass/pom.xml
index 67e3abf..b118f2f 100644
--- a/security/bypass/pom.xml
+++ b/security/bypass/pom.xml
@@ -22,7 +22,7 @@
 
     <parent>
         <groupId>org.apache.isis.core</groupId>
-        <artifactId>isis</artifactId>
+        <artifactId>isis-core</artifactId>
         <version>2.0.0-SNAPSHOT</version>
         <relativePath>../../core/pom.xml</relativePath>
     </parent>
diff --git a/security/keycloak/pom.xml b/security/keycloak/pom.xml
index f54b186..c6cd4fd 100644
--- a/security/keycloak/pom.xml
+++ b/security/keycloak/pom.xml
@@ -22,7 +22,7 @@
 
     <parent>
         <groupId>org.apache.isis.core</groupId>
-        <artifactId>isis</artifactId>
+        <artifactId>isis-core</artifactId>
     	<version>2.0.0-SNAPSHOT</version>
         <relativePath>../../core/pom.xml</relativePath>
     </parent>
diff --git a/security/shiro/pom.xml b/security/shiro/pom.xml
index 029ab4e..ea563bf 100644
--- a/security/shiro/pom.xml
+++ b/security/shiro/pom.xml
@@ -22,7 +22,7 @@
 
     <parent>
         <groupId>org.apache.isis.core</groupId>
-        <artifactId>isis</artifactId>
+        <artifactId>isis-core</artifactId>
     	<version>2.0.0-SNAPSHOT</version>
         <relativePath>../../core/pom.xml</relativePath>
     </parent>
diff --git a/settings.gradle b/settings.gradle
index 9c092fc..c014c60 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -30,7 +30,7 @@ include ':isis-parent:isis:isis-persistence-jdo'
 include ':isis-parent:isis:isis-persistence-jpa:isis-persistence-jpa-applib'
 include ':isis-parent:isis:isis-persistence-jpa:isis-persistence-jpa-model'
 include ':isis-parent:isis:isis-persistence-jpa'
-include ':isis-parent:isis'
+include ':isis-parent:isis-core'
 include ':isis-parent:isis:isis-extensions:isis-extensions-flyway:isis-extensions-flyway-impl'
 include ':isis-parent:isis:isis-extensions:isis-extensions-flyway'
 include ':isis-parent:isis:isis-extensions:isis-extensions-modelannotation'
@@ -135,7 +135,7 @@ include ':isis-app-starter-parent:smoketests'
 project(':isis-parent:isis-schema').projectDir = "$rootDir/api/schema" as File
 project(':isis-parent:isis-applib').projectDir = "$rootDir/api/applib" as File
 project(':isis-parent:isis:isis-core-codegen-bytebuddy').projectDir = "$rootDir/core/codegen-bytebuddy" as File
-project(':isis-parent:isis:isis-core-commons').projectDir = "$rootDir/core/commons" as File
+project(':isis-parent:isis:isis-commons').projectDir = "$rootDir/commons" as File
 project(':isis-parent:isis:isis-core-config').projectDir = "$rootDir/core/config" as File
 project(':isis-parent:isis:isis-core-internaltestsupport').projectDir = "$rootDir/core/internaltestsupport" as File
 project(':isis-parent:isis:isis-core-metamodel').projectDir = "$rootDir/core/metamodel" as File
@@ -163,7 +163,7 @@ project(':isis-parent:isis:isis-persistence-jdo').projectDir = "$rootDir/persist
 project(':isis-parent:isis:isis-persistence-jpa:isis-persistence-jpa-applib').projectDir = "$rootDir/persistence/jpa/applib" as File
 project(':isis-parent:isis:isis-persistence-jpa:isis-persistence-jpa-model').projectDir = "$rootDir/persistence/jpa/model" as File
 project(':isis-parent:isis:isis-persistence-jpa').projectDir = "$rootDir/persistence/jpa" as File
-project(':isis-parent:isis').projectDir = "$rootDir/core" as File
+project(':isis-parent:isis-core').projectDir = "$rootDir/core" as File
 project(':isis-parent:isis:isis-extensions:isis-extensions-flyway:isis-extensions-flyway-impl').projectDir = "$rootDir/extensions/core/flyway/impl" as File
 project(':isis-parent:isis:isis-extensions:isis-extensions-flyway').projectDir = "$rootDir/extensions/core/flyway" as File
 project(':isis-parent:isis:isis-extensions:isis-extensions-modelannotation').projectDir = "$rootDir/extensions/core/model-annotation" as File
diff --git a/starters/pom.xml b/starters/pom.xml
index 292c249..f5086da 100644
--- a/starters/pom.xml
+++ b/starters/pom.xml
@@ -88,7 +88,7 @@
 		<dependencies>
 			<dependency>
 				<groupId>org.apache.isis.core</groupId>
-				<artifactId>isis</artifactId>
+				<artifactId>isis-core</artifactId>
 				<version>2.0.0-SNAPSHOT</version>
 				<scope>import</scope>
 				<type>pom</type>
diff --git a/subdomains/pom.xml b/subdomains/pom.xml
index 7595028..a98b309 100644
--- a/subdomains/pom.xml
+++ b/subdomains/pom.xml
@@ -16,7 +16,7 @@
 
 	<parent>
 		<groupId>org.apache.isis.core</groupId>
-		<artifactId>isis</artifactId>
+		<artifactId>isis-core</artifactId>
 		<version>2.0.0-SNAPSHOT</version>
 		<relativePath>../core/pom.xml</relativePath>
 	</parent>
diff --git a/testing/pom.xml b/testing/pom.xml
index 8cdfe59..e995032 100644
--- a/testing/pom.xml
+++ b/testing/pom.xml
@@ -16,7 +16,7 @@
 
 	<parent>
 		<groupId>org.apache.isis.core</groupId>
-		<artifactId>isis</artifactId>
+		<artifactId>isis-core</artifactId>
 		<version>2.0.0-SNAPSHOT</version>
 		<relativePath>../core/pom.xml</relativePath>
 	</parent>
diff --git a/tooling/pom.xml b/tooling/pom.xml
index ffda819..42ecab3 100644
--- a/tooling/pom.xml
+++ b/tooling/pom.xml
@@ -15,7 +15,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.apache.isis.core</groupId>
+		<groupId>org.apache.isis</groupId>
 		<artifactId>isis-parent</artifactId>
 		<version>2.0.0-SNAPSHOT</version>
 		<relativePath>../isis-parent/pom.xml</relativePath>
diff --git a/tooling/projectmodel/src/test/java/org/apache/isis/tooling/projectmodel/test/ProjectTreeTest.java b/tooling/projectmodel/src/test/java/org/apache/isis/tooling/projectmodel/test/ProjectTreeTest.java
index 213e5e9..6fcc0d6 100644
--- a/tooling/projectmodel/src/test/java/org/apache/isis/tooling/projectmodel/test/ProjectTreeTest.java
+++ b/tooling/projectmodel/src/test/java/org/apache/isis/tooling/projectmodel/test/ProjectTreeTest.java
@@ -94,7 +94,7 @@ class ProjectTreeTest {
     
     private void assertHasSomeArtifactKeys(Set<String> artifactKeys) {
         assertTrue(artifactKeys.size()>50);
-        assertTrue(artifactKeys.contains("org.apache.isis.core:isis:pom"));
+        assertTrue(artifactKeys.contains("org.apache.isis.core:isis-core:pom"));
         assertTrue(artifactKeys.contains("org.apache.isis.core:isis-core-config:jar"));
         assertTrue(artifactKeys.contains("org.apache.isis.core:isis-core-metamodel:jar"));
         assertTrue(artifactKeys.contains("org.apache.isis.core:isis-core-runtime:jar"));
diff --git a/valuetypes/asciidoc/applib/pom.xml b/valuetypes/asciidoc/applib/pom.xml
index 2306b69..87a57ee 100644
--- a/valuetypes/asciidoc/applib/pom.xml
+++ b/valuetypes/asciidoc/applib/pom.xml
@@ -35,8 +35,8 @@
 			<artifactId>isis-applib</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.apache.isis.core</groupId>
-			<artifactId>isis-core-commons</artifactId>
+			<groupId>org.apache.isis.commons</groupId>
+			<artifactId>isis-commons</artifactId>
 		</dependency>
 
 		<dependency>
diff --git a/valuetypes/asciidoc/ui/wicket/build.gradle b/valuetypes/asciidoc/ui/wicket/build.gradle
index c36c3b8..bdd95b4 100644
--- a/valuetypes/asciidoc/ui/wicket/build.gradle
+++ b/valuetypes/asciidoc/ui/wicket/build.gradle
@@ -4,7 +4,7 @@ apply plugin: 'war'
 
 dependencies {
     compile project(':isis-parent:isis-applib')
-    compile project(':isis-parent:isis:isis-core-commons')
+    compile project(':isis-parent:isis:isis-commons')
     compile project(':isis-parent:isis:isis-valuetypes:isis-valuetypes-asciidoc')
     compile project(':isis-parent:isis:isis-valuetypes:isis-valuetypes-asciidoc:isis-valuetypes-asciidoc-applib')
 
diff --git a/valuetypes/markdown/applib/pom.xml b/valuetypes/markdown/applib/pom.xml
index e6f3f55..e127a1c 100644
--- a/valuetypes/markdown/applib/pom.xml
+++ b/valuetypes/markdown/applib/pom.xml
@@ -35,8 +35,8 @@
 			<artifactId>isis-applib</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.apache.isis.core</groupId>
-			<artifactId>isis-core-commons</artifactId>
+			<groupId>org.apache.isis.commons</groupId>
+			<artifactId>isis-commons</artifactId>
 		</dependency>
 
 		<dependency>
diff --git a/valuetypes/pom.xml b/valuetypes/pom.xml
index cd7add4..c8ee4e8 100644
--- a/valuetypes/pom.xml
+++ b/valuetypes/pom.xml
@@ -16,7 +16,7 @@
 
 	<parent>
 		<groupId>org.apache.isis.core</groupId>
-		<artifactId>isis</artifactId>
+		<artifactId>isis-core</artifactId>
 		<version>2.0.0-SNAPSHOT</version>
 		<relativePath>../core/pom.xml</relativePath>
 	</parent>
diff --git a/viewers/common/pom.xml b/viewers/common/pom.xml
index db98990..f6e1a66 100644
--- a/viewers/common/pom.xml
+++ b/viewers/common/pom.xml
@@ -23,7 +23,7 @@
 
     <parent>
         <groupId>org.apache.isis.core</groupId>
-        <artifactId>isis</artifactId>
+        <artifactId>isis-core</artifactId>
         <version>2.0.0-SNAPSHOT</version>
         <relativePath>../../core/pom.xml</relativePath>
     </parent>
diff --git a/viewers/restfulobjects/pom.xml b/viewers/restfulobjects/pom.xml
index fd4a77e..9ae5b46 100644
--- a/viewers/restfulobjects/pom.xml
+++ b/viewers/restfulobjects/pom.xml
@@ -22,7 +22,7 @@
 
     <parent>
         <groupId>org.apache.isis.core</groupId>
-        <artifactId>isis</artifactId>
+        <artifactId>isis-core</artifactId>
         <version>2.0.0-SNAPSHOT</version>
         <relativePath>../../core/pom.xml</relativePath>
     </parent>
diff --git a/viewers/wicket/pom.xml b/viewers/wicket/pom.xml
index 6313a69..1d12d02 100644
--- a/viewers/wicket/pom.xml
+++ b/viewers/wicket/pom.xml
@@ -23,7 +23,7 @@
 
     <parent>
         <groupId>org.apache.isis.core</groupId>
-        <artifactId>isis</artifactId>
+        <artifactId>isis-core</artifactId>
         <version>2.0.0-SNAPSHOT</version>
         <relativePath>../../core/pom.xml</relativePath>
     </parent>