You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2017/10/05 11:20:43 UTC

[isis] branch dev/2.0.0/ISIS-1742-remove-deprecations updated (8e25a9a -> b80c00f)

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

danhaywood pushed a change to branch dev/2.0.0/ISIS-1742-remove-deprecations
in repository https://gitbox.apache.org/repos/asf/isis.git.


    from 8e25a9a  ISIS-1742: updates .adocs, removes references to .layout.json files
     new df53713  ISIS-1742: removes @Aggregated annotation, updates .adocs
     new b80c00f  ISIS-1742: updates version to 2.0.0-SNAPSHOT

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../asciidoc/guides/rgant/_rgant_aaa_partial.adoc  |  7 --
 core/applib/pom.xml                                |  2 +-
 .../applib/adapters/ValueSemanticsProvider.java    |  1 -
 .../apache/isis/applib/annotation/Aggregated.java  | 36 ----------
 core/integtestsupport/pom.xml                      |  2 +-
 core/log4j/pom.xml                                 |  2 +-
 core/maven-plugin/pom.xml                          |  2 +-
 core/mavendeps-intellij/pom.xml                    |  2 +-
 core/mavendeps-testing/pom.xml                     |  2 +-
 core/mavendeps-webapp/pom.xml                      |  2 +-
 core/metamodel/pom.xml                             |  2 +-
 .../aggregated/AggregatedAnnotationFactory.java    | 76 ----------------------
 .../dflt/ProgrammingModelFacetsJava5.java          |  3 -
 .../AggregatedAnnotationFactory.java               |  1 -
 .../ViewModelSemanticCheckingFacetFactoryTest.java |  1 +
 .../AggregatedAnnotationFactoryTest.java           | 58 -----------------
 core/pom.xml                                       | 70 ++++++++++----------
 core/runtime/pom.xml                               |  2 +-
 .../runtime/persistence/AggregatedFacetAlways.java | 32 ---------
 core/schema/pom.xml                                |  2 +-
 core/security-shiro/pom.xml                        |  6 +-
 core/security/pom.xml                              |  2 +-
 core/specsupport/pom.xml                           |  2 +-
 core/unittestsupport/pom.xml                       |  2 +-
 core/viewer-restfulobjects-applib/pom.xml          |  2 +-
 core/viewer-restfulobjects-rendering/pom.xml       |  2 +-
 core/viewer-restfulobjects-server/pom.xml          |  2 +-
 core/viewer-wicket-applib/pom.xml                  |  2 +-
 core/viewer-wicket-impl/pom.xml                    |  2 +-
 core/viewer-wicket-model/pom.xml                   |  2 +-
 core/viewer-wicket-ui/pom.xml                      |  2 +-
 core/webserver/pom.xml                             |  2 +-
 core/wrapper/pom.xml                               |  2 +-
 example/application/helloworld/pom.xml             |  4 +-
 example/application/simpleapp/application/pom.xml  |  2 +-
 .../application/simpleapp/module-simple/pom.xml    |  2 +-
 example/application/simpleapp/pom.xml              |  4 +-
 example/application/simpleapp/webapp/pom.xml       |  2 +-
 example/archetype/simpleapp/pom.xml                |  2 +-
 pom.xml                                            |  2 +-
 todo-deprecation-list.txt                          |  6 +-
 41 files changed, 75 insertions(+), 284 deletions(-)
 delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/annotation/Aggregated.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parented/aggregated/AggregatedAnnotationFactory.java
 delete mode 100644 core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/parented/aggregated/AggregatedAnnotationFactoryTest.java
 delete mode 100644 core/runtime/src/test/java/org/apache/isis/core/runtime/persistence/AggregatedFacetAlways.java

-- 
To stop receiving notification emails like this one, please contact
['"commits@isis.apache.org" <co...@isis.apache.org>'].

[isis] 02/02: ISIS-1742: updates version to 2.0.0-SNAPSHOT

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch dev/2.0.0/ISIS-1742-remove-deprecations
in repository https://gitbox.apache.org/repos/asf/isis.git

commit b80c00f897286fd51983ec1d33d5e5818e247e10
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Oct 5 14:20:32 2017 +0300

    ISIS-1742: updates version to 2.0.0-SNAPSHOT
---
 core/applib/pom.xml                                |  2 +-
 core/integtestsupport/pom.xml                      |  2 +-
 core/log4j/pom.xml                                 |  2 +-
 core/maven-plugin/pom.xml                          |  2 +-
 core/mavendeps-intellij/pom.xml                    |  2 +-
 core/mavendeps-testing/pom.xml                     |  2 +-
 core/mavendeps-webapp/pom.xml                      |  2 +-
 core/metamodel/pom.xml                             |  2 +-
 core/pom.xml                                       | 70 +++++++++++-----------
 core/runtime/pom.xml                               |  2 +-
 core/schema/pom.xml                                |  2 +-
 core/security-shiro/pom.xml                        |  6 +-
 core/security/pom.xml                              |  2 +-
 core/specsupport/pom.xml                           |  2 +-
 core/unittestsupport/pom.xml                       |  2 +-
 core/viewer-restfulobjects-applib/pom.xml          |  2 +-
 core/viewer-restfulobjects-rendering/pom.xml       |  2 +-
 core/viewer-restfulobjects-server/pom.xml          |  2 +-
 core/viewer-wicket-applib/pom.xml                  |  2 +-
 core/viewer-wicket-impl/pom.xml                    |  2 +-
 core/viewer-wicket-model/pom.xml                   |  2 +-
 core/viewer-wicket-ui/pom.xml                      |  2 +-
 core/webserver/pom.xml                             |  2 +-
 core/wrapper/pom.xml                               |  2 +-
 example/application/helloworld/pom.xml             |  4 +-
 example/application/simpleapp/application/pom.xml  |  2 +-
 .../application/simpleapp/module-simple/pom.xml    |  2 +-
 example/application/simpleapp/pom.xml              |  4 +-
 example/application/simpleapp/webapp/pom.xml       |  2 +-
 example/archetype/simpleapp/pom.xml                |  2 +-
 pom.xml                                            |  2 +-
 31 files changed, 69 insertions(+), 69 deletions(-)

diff --git a/core/applib/pom.xml b/core/applib/pom.xml
index c048c8c..cea4c42 100644
--- a/core/applib/pom.xml
+++ b/core/applib/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.isis.core</groupId>
         <artifactId>isis</artifactId>
-        <version>1.16.0-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>isis-core-applib</artifactId>
diff --git a/core/integtestsupport/pom.xml b/core/integtestsupport/pom.xml
index fc22bd8..a637d0c 100644
--- a/core/integtestsupport/pom.xml
+++ b/core/integtestsupport/pom.xml
@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>org.apache.isis.core</groupId>
 		<artifactId>isis</artifactId>
-        <version>1.16.0-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>isis-core-integtestsupport</artifactId>
diff --git a/core/log4j/pom.xml b/core/log4j/pom.xml
index d56799f..131df8c 100644
--- a/core/log4j/pom.xml
+++ b/core/log4j/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <groupId>org.apache.isis.core</groupId>
         <artifactId>isis</artifactId>
-        <version>1.16.0-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>isis-core-log4j</artifactId>
diff --git a/core/maven-plugin/pom.xml b/core/maven-plugin/pom.xml
index 0988899..3dbc420 100644
--- a/core/maven-plugin/pom.xml
+++ b/core/maven-plugin/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.isis.core</groupId>
         <artifactId>isis</artifactId>
-        <version>1.16.0-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.isis.tool</groupId>
diff --git a/core/mavendeps-intellij/pom.xml b/core/mavendeps-intellij/pom.xml
index 4e8600c..d18a94c 100644
--- a/core/mavendeps-intellij/pom.xml
+++ b/core/mavendeps-intellij/pom.xml
@@ -24,7 +24,7 @@
 	<parent>
         <groupId>org.apache.isis.core</groupId>
         <artifactId>isis</artifactId>
-        <version>1.16.0-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.isis.mavendeps</groupId>
diff --git a/core/mavendeps-testing/pom.xml b/core/mavendeps-testing/pom.xml
index 3a9959f..117bd2c 100644
--- a/core/mavendeps-testing/pom.xml
+++ b/core/mavendeps-testing/pom.xml
@@ -24,7 +24,7 @@
 	<parent>
         <groupId>org.apache.isis.core</groupId>
         <artifactId>isis</artifactId>
-        <version>1.16.0-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.isis.mavendeps</groupId>
diff --git a/core/mavendeps-webapp/pom.xml b/core/mavendeps-webapp/pom.xml
index 3e50ee5..e6392d0 100644
--- a/core/mavendeps-webapp/pom.xml
+++ b/core/mavendeps-webapp/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.isis.core</groupId>
         <artifactId>isis</artifactId>
-        <version>1.16.0-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.isis.mavendeps</groupId>
diff --git a/core/metamodel/pom.xml b/core/metamodel/pom.xml
index c9cf55a..c2118f0 100644
--- a/core/metamodel/pom.xml
+++ b/core/metamodel/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.isis.core</groupId>
         <artifactId>isis</artifactId>
-        <version>1.16.0-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>isis-core-metamodel</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index d898beb..a4868e5 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -29,7 +29,7 @@
 
     <groupId>org.apache.isis.core</groupId>
     <artifactId>isis</artifactId>
-    <version>1.16.0-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     
     <packaging>pom</packaging>
 
@@ -1083,12 +1083,12 @@ ${license.additional-notes}
             <dependency>
                 <groupId>org.apache.isis.core</groupId>
                 <artifactId>isis-core-unittestsupport</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>2.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.isis.core</groupId>
                 <artifactId>isis-core-unittestsupport</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>2.0.0-SNAPSHOT</version>
                 <type>test-jar</type>
                 <scope>test</scope>
             </dependency>
@@ -1097,14 +1097,14 @@ ${license.additional-notes}
             <dependency>
                 <groupId>org.apache.isis.core</groupId>
                 <artifactId>isis-core-applib</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>2.0.0-SNAPSHOT</version>
                 <type>jar</type>
                 <scope>compile</scope>
             </dependency>
             <dependency>
                 <groupId>org.apache.isis.core</groupId>
                 <artifactId>isis-core-applib</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>2.0.0-SNAPSHOT</version>
                 <type>test-jar</type>
                 <scope>test</scope>
             </dependency>
@@ -1113,14 +1113,14 @@ ${license.additional-notes}
             <dependency>
                 <groupId>org.apache.isis.core</groupId>
                 <artifactId>isis-core-schema</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>2.0.0-SNAPSHOT</version>
                 <type>jar</type>
                 <scope>compile</scope>
             </dependency>
             <dependency>
                 <groupId>org.apache.isis.core</groupId>
                 <artifactId>isis-core-schema</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>2.0.0-SNAPSHOT</version>
                 <type>test-jar</type>
                 <scope>test</scope>
             </dependency>
@@ -1129,7 +1129,7 @@ ${license.additional-notes}
             <dependency>
                 <groupId>org.apache.isis.core</groupId>
                 <artifactId>isis-core-log4j</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>2.0.0-SNAPSHOT</version>
                 <type>jar</type>
                 <scope>compile</scope>
             </dependency>
@@ -1138,14 +1138,14 @@ ${license.additional-notes}
             <dependency>
                 <groupId>org.apache.isis.core</groupId>
                 <artifactId>isis-core-metamodel</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>2.0.0-SNAPSHOT</version>
                 <type>jar</type>
                 <scope>compile</scope>
             </dependency>
             <dependency>
                 <groupId>org.apache.isis.core</groupId>
                 <artifactId>isis-core-metamodel</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>2.0.0-SNAPSHOT</version>
                 <type>test-jar</type>
                 <scope>test</scope>
             </dependency>
@@ -1154,76 +1154,76 @@ ${license.additional-notes}
             <dependency>
                 <groupId>org.apache.isis.core</groupId>
                 <artifactId>isis-core-runtime</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>2.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.isis.core</groupId>
                 <artifactId>isis-core-runtime</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>2.0.0-SNAPSHOT</version>
                 <type>test-jar</type>
                 <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>org.apache.isis.core</groupId>
                 <artifactId>isis-core-wrapper</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>2.0.0-SNAPSHOT</version>
             </dependency>
 
             <!-- webserver -->
             <dependency>
                 <groupId>org.apache.isis.core</groupId>
                 <artifactId>isis-core-webserver</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>2.0.0-SNAPSHOT</version>
             </dependency>
 
             <!-- specsupport -->
             <dependency>
                 <groupId>org.apache.isis.core</groupId>
                 <artifactId>isis-core-specsupport</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>2.0.0-SNAPSHOT</version>
             </dependency>
 
             <!-- integtestsupport -->
             <dependency>
                 <groupId>org.apache.isis.core</groupId>
                 <artifactId>isis-core-integtestsupport</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>2.0.0-SNAPSHOT</version>
             </dependency>
 
             <!-- Restful Objects viewer -->
             <dependency>
                 <groupId>org.apache.isis.core</groupId>
                 <artifactId>isis-core-viewer-restfulobjects-applib</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>2.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.isis.core</groupId>
                 <artifactId>isis-core-viewer-restfulobjects-applib</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>2.0.0-SNAPSHOT</version>
                 <type>test-jar</type>
                 <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>org.apache.isis.core</groupId>
                 <artifactId>isis-core-viewer-restfulobjects-rendering</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>2.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.isis.core</groupId>
                 <artifactId>isis-core-viewer-restfulobjects-rendering</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>2.0.0-SNAPSHOT</version>
                 <type>test-jar</type>
                 <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>org.apache.isis.core</groupId>
                 <artifactId>isis-core-viewer-restfulobjects-server</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>2.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.isis.core</groupId>
                 <artifactId>isis-core-viewer-restfulobjects-server</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>2.0.0-SNAPSHOT</version>
                 <type>test-jar</type>
                 <scope>test</scope>
             </dependency>
@@ -1232,12 +1232,12 @@ ${license.additional-notes}
             <dependency>
                 <groupId>org.apache.isis.core</groupId>
                 <artifactId>isis-core-security</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>2.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.isis.core</groupId>
                 <artifactId>isis-core-security-shiro</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>2.0.0-SNAPSHOT</version>
             </dependency>
 
             
@@ -1245,41 +1245,41 @@ ${license.additional-notes}
             <dependency>
                 <groupId>org.apache.isis.core</groupId>
                 <artifactId>isis-core-viewer-wicket-applib</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>2.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.isis.core</groupId>
                 <artifactId>isis-core-viewer-wicket-model</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>2.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.isis.core</groupId>
                 <artifactId>isis-core-viewer-wicket-model</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>2.0.0-SNAPSHOT</version>
                 <scope>test</scope>
                 <type>test-jar</type>
             </dependency>
             <dependency>
                 <groupId>org.apache.isis.core</groupId>
                 <artifactId>isis-core-viewer-wicket-ui</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>2.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.isis.core</groupId>
                 <artifactId>isis-core-viewer-wicket-ui</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>2.0.0-SNAPSHOT</version>
                 <scope>test</scope>
                 <type>test-jar</type>
             </dependency>
             <dependency>
                 <groupId>org.apache.isis.core</groupId>
                 <artifactId>isis-core-viewer-wicket-impl</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>2.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.isis.core</groupId>
                 <artifactId>isis-core-viewer-wicket-impl</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>2.0.0-SNAPSHOT</version>
                 <scope>test</scope>
                 <type>test-jar</type>
             </dependency>
@@ -1288,26 +1288,26 @@ ${license.additional-notes}
             <dependency>
                 <groupId>org.apache.isis.tool</groupId>
                 <artifactId>isis-maven-plugin</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>2.0.0-SNAPSHOT</version>
             </dependency>
 
             <!-- Maven dependencies -->
             <dependency>
                 <groupId>org.apache.isis.mavendeps</groupId>
                 <artifactId>isis-mavendeps-intellij</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>2.0.0-SNAPSHOT</version>
                 <type>pom</type>
             </dependency>
             <dependency>
                 <groupId>org.apache.isis.mavendeps</groupId>
                 <artifactId>isis-mavendeps-testing</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>2.0.0-SNAPSHOT</version>
                 <type>pom</type>
             </dependency>
             <dependency>
                 <groupId>org.apache.isis.mavendeps</groupId>
                 <artifactId>isis-mavendeps-webapp</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>2.0.0-SNAPSHOT</version>
                 <type>pom</type>
             </dependency>
 
diff --git a/core/runtime/pom.xml b/core/runtime/pom.xml
index e5447a6..efe21b2 100644
--- a/core/runtime/pom.xml
+++ b/core/runtime/pom.xml
@@ -23,7 +23,7 @@
     <parent>
 		<groupId>org.apache.isis.core</groupId>
 		<artifactId>isis</artifactId>
-        <version>1.16.0-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>isis-core-runtime</artifactId>
diff --git a/core/schema/pom.xml b/core/schema/pom.xml
index 3299bed..d106119 100644
--- a/core/schema/pom.xml
+++ b/core/schema/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.isis.core</groupId>
         <artifactId>isis</artifactId>
-        <version>1.16.0-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>isis-core-schema</artifactId>
diff --git a/core/security-shiro/pom.xml b/core/security-shiro/pom.xml
index d4b207e..a2c6c5b 100644
--- a/core/security-shiro/pom.xml
+++ b/core/security-shiro/pom.xml
@@ -23,12 +23,12 @@
 	<parent>
 		<groupId>org.apache.isis.core</groupId>
 		<artifactId>isis</artifactId>
-        <version>1.16.0-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
 	</parent>
 
 	<groupId>org.apache.isis.core</groupId>
 	<artifactId>isis-core-security-shiro</artifactId>
-    <version>1.16.0-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
 
 	<name>Apache Isis Security Shiro</name>
 
@@ -65,7 +65,7 @@
 			<dependency>
 			    <groupId>org.apache.isis.core</groupId>
 			    <artifactId>isis-core-security-shiro</artifactId>
-				<version>1.16.0-SNAPSHOT</version>
+				<version>2.0.0-SNAPSHOT</version>
 			</dependency>
     	</dependencies>
     </dependencyManagement>
diff --git a/core/security/pom.xml b/core/security/pom.xml
index 66ec722..820920b 100644
--- a/core/security/pom.xml
+++ b/core/security/pom.xml
@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>org.apache.isis.core</groupId>
 		<artifactId>isis</artifactId>
-        <version>1.16.0-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>isis-core-security</artifactId>
diff --git a/core/specsupport/pom.xml b/core/specsupport/pom.xml
index 63bed58..11e0279 100644
--- a/core/specsupport/pom.xml
+++ b/core/specsupport/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <groupId>org.apache.isis.core</groupId>
         <artifactId>isis</artifactId>
-        <version>1.16.0-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>isis-core-specsupport</artifactId>
diff --git a/core/unittestsupport/pom.xml b/core/unittestsupport/pom.xml
index 2c84d64..8d09993 100644
--- a/core/unittestsupport/pom.xml
+++ b/core/unittestsupport/pom.xml
@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>org.apache.isis.core</groupId>
 		<artifactId>isis</artifactId>
-        <version>1.16.0-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>isis-core-unittestsupport</artifactId>
diff --git a/core/viewer-restfulobjects-applib/pom.xml b/core/viewer-restfulobjects-applib/pom.xml
index a0bbeb3..36fa5c1 100644
--- a/core/viewer-restfulobjects-applib/pom.xml
+++ b/core/viewer-restfulobjects-applib/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.isis.core</groupId>
         <artifactId>isis</artifactId>
-        <version>1.16.0-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
 	<artifactId>isis-core-viewer-restfulobjects-applib</artifactId>
diff --git a/core/viewer-restfulobjects-rendering/pom.xml b/core/viewer-restfulobjects-rendering/pom.xml
index 8399959..e0afef1 100644
--- a/core/viewer-restfulobjects-rendering/pom.xml
+++ b/core/viewer-restfulobjects-rendering/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.isis.core</groupId>
         <artifactId>isis</artifactId>
-        <version>1.16.0-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>isis-core-viewer-restfulobjects-rendering</artifactId>
diff --git a/core/viewer-restfulobjects-server/pom.xml b/core/viewer-restfulobjects-server/pom.xml
index 67ed167..a7d6e46 100644
--- a/core/viewer-restfulobjects-server/pom.xml
+++ b/core/viewer-restfulobjects-server/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.isis.core</groupId>
         <artifactId>isis</artifactId>
-        <version>1.16.0-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>isis-core-viewer-restfulobjects-server</artifactId>
diff --git a/core/viewer-wicket-applib/pom.xml b/core/viewer-wicket-applib/pom.xml
index 6d46917..47c6fa0 100644
--- a/core/viewer-wicket-applib/pom.xml
+++ b/core/viewer-wicket-applib/pom.xml
@@ -24,7 +24,7 @@
 	<parent>
 		<groupId>org.apache.isis.core</groupId>
 		<artifactId>isis</artifactId>
-		<version>1.16.0-SNAPSHOT</version>
+		<version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.isis.core</groupId>
diff --git a/core/viewer-wicket-impl/pom.xml b/core/viewer-wicket-impl/pom.xml
index b629f31..d012f16 100644
--- a/core/viewer-wicket-impl/pom.xml
+++ b/core/viewer-wicket-impl/pom.xml
@@ -24,7 +24,7 @@
 	<parent>
 		<groupId>org.apache.isis.core</groupId>
 		<artifactId>isis</artifactId>
-		<version>1.16.0-SNAPSHOT</version>
+		<version>2.0.0-SNAPSHOT</version>
 	</parent>
 
 	<name>Apache Isis Wicket Viewer Implementation</name>
diff --git a/core/viewer-wicket-model/pom.xml b/core/viewer-wicket-model/pom.xml
index c80a80f..5eddfd6 100644
--- a/core/viewer-wicket-model/pom.xml
+++ b/core/viewer-wicket-model/pom.xml
@@ -24,7 +24,7 @@
 	<parent>
 		<groupId>org.apache.isis.core</groupId>
 		<artifactId>isis</artifactId>
-		<version>1.16.0-SNAPSHOT</version>
+		<version>2.0.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>isis-core-viewer-wicket-model</artifactId>
diff --git a/core/viewer-wicket-ui/pom.xml b/core/viewer-wicket-ui/pom.xml
index dbf7317..f5fffc1 100644
--- a/core/viewer-wicket-ui/pom.xml
+++ b/core/viewer-wicket-ui/pom.xml
@@ -24,7 +24,7 @@
 	<parent>
 		<groupId>org.apache.isis.core</groupId>
 		<artifactId>isis</artifactId>
-		<version>1.16.0-SNAPSHOT</version>
+		<version>2.0.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>isis-core-viewer-wicket-ui</artifactId>
diff --git a/core/webserver/pom.xml b/core/webserver/pom.xml
index ae48ce9..d3d3caa 100644
--- a/core/webserver/pom.xml
+++ b/core/webserver/pom.xml
@@ -23,7 +23,7 @@
     <parent>
 		<groupId>org.apache.isis.core</groupId>
 		<artifactId>isis</artifactId>
-        <version>1.16.0-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
 	<artifactId>isis-core-webserver</artifactId>
diff --git a/core/wrapper/pom.xml b/core/wrapper/pom.xml
index 549641d..50eb805 100644
--- a/core/wrapper/pom.xml
+++ b/core/wrapper/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.isis.core</groupId>
         <artifactId>isis</artifactId>
-        <version>1.16.0-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>isis-core-wrapper</artifactId>
diff --git a/example/application/helloworld/pom.xml b/example/application/helloworld/pom.xml
index ecbd029..ca4d589 100644
--- a/example/application/helloworld/pom.xml
+++ b/example/application/helloworld/pom.xml
@@ -29,14 +29,14 @@
 
     <groupId>org.apache.isis.example.application</groupId>
     <artifactId>helloworld</artifactId>
-    <version>1.16.0-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
 
     <name>HelloWorld</name>
 
     <packaging>war</packaging>
 
     <properties>
-        <isis.version>1.16.0-SNAPSHOT</isis.version>
+        <isis.version>2.0.0-SNAPSHOT</isis.version>
 
         <lombok.version>1.16.18</lombok.version>
 
diff --git a/example/application/simpleapp/application/pom.xml b/example/application/simpleapp/application/pom.xml
index 6800a60..298a2f2 100644
--- a/example/application/simpleapp/application/pom.xml
+++ b/example/application/simpleapp/application/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.isis.example.application</groupId>
         <artifactId>simpleapp</artifactId>
-        <version>1.16.0-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>simpleapp-application</artifactId>
diff --git a/example/application/simpleapp/module-simple/pom.xml b/example/application/simpleapp/module-simple/pom.xml
index 0cc97ca..f4b84af 100644
--- a/example/application/simpleapp/module-simple/pom.xml
+++ b/example/application/simpleapp/module-simple/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.isis.example.application</groupId>
         <artifactId>simpleapp</artifactId>
-        <version>1.16.0-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>simpleapp-module-simple</artifactId>
diff --git a/example/application/simpleapp/pom.xml b/example/application/simpleapp/pom.xml
index bbe8d71..e74d749 100644
--- a/example/application/simpleapp/pom.xml
+++ b/example/application/simpleapp/pom.xml
@@ -29,7 +29,7 @@
 
     <groupId>org.apache.isis.example.application</groupId>
     <artifactId>simpleapp</artifactId>
-    <version>1.16.0-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
 
     <name>SimpleApp Parent</name>
 
@@ -40,7 +40,7 @@
     </prerequisites>
 
     <properties>
-        <isis.version>1.16.0-SNAPSHOT</isis.version>
+        <isis.version>2.0.0-SNAPSHOT</isis.version>
 
         <lombok.version>1.16.18</lombok.version>
 
diff --git a/example/application/simpleapp/webapp/pom.xml b/example/application/simpleapp/webapp/pom.xml
index ffe16fa..a7d9124 100644
--- a/example/application/simpleapp/webapp/pom.xml
+++ b/example/application/simpleapp/webapp/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.isis.example.application</groupId>
         <artifactId>simpleapp</artifactId>
-        <version>1.16.0-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>simpleapp-webapp</artifactId>
diff --git a/example/archetype/simpleapp/pom.xml b/example/archetype/simpleapp/pom.xml
index 652b50a..fccf505 100644
--- a/example/archetype/simpleapp/pom.xml
+++ b/example/archetype/simpleapp/pom.xml
@@ -70,7 +70,7 @@
     <parent>
         <groupId>org.apache.isis.core</groupId>
         <artifactId>isis</artifactId>
-        <version>1.15.1</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../../../core/pom.xml</relativePath>
     </parent>
     <properties>
diff --git a/pom.xml b/pom.xml
index 234d064..d973293 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
 
     <groupId>org.apache.isis</groupId>
     <artifactId>isis-all</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
 
     <packaging>pom</packaging>
 

-- 
To stop receiving notification emails like this one, please contact
"commits@isis.apache.org" <co...@isis.apache.org>.

[isis] 01/02: ISIS-1742: removes @Aggregated annotation, updates .adocs

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch dev/2.0.0/ISIS-1742-remove-deprecations
in repository https://gitbox.apache.org/repos/asf/isis.git

commit df537139162fea5897f9529aea771a15f149d7ab
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Oct 5 14:15:56 2017 +0300

    ISIS-1742: removes @Aggregated annotation, updates .adocs
---
 .../asciidoc/guides/rgant/_rgant_aaa_partial.adoc  |  7 --
 .../applib/adapters/ValueSemanticsProvider.java    |  1 -
 .../apache/isis/applib/annotation/Aggregated.java  | 36 ----------
 .../aggregated/AggregatedAnnotationFactory.java    | 76 ----------------------
 .../dflt/ProgrammingModelFacetsJava5.java          |  3 -
 .../AggregatedAnnotationFactory.java               |  1 -
 .../ViewModelSemanticCheckingFacetFactoryTest.java |  1 +
 .../AggregatedAnnotationFactoryTest.java           | 58 -----------------
 .../runtime/persistence/AggregatedFacetAlways.java | 32 ---------
 example/application/helloworld/pom.xml             |  2 +-
 example/application/simpleapp/pom.xml              |  2 +-
 todo-deprecation-list.txt                          |  6 +-
 12 files changed, 8 insertions(+), 217 deletions(-)

diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant_aaa_partial.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant_aaa_partial.adoc
index 41b7ab9..ee0c0f6 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant_aaa_partial.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant_aaa_partial.adoc
@@ -15,13 +15,6 @@ These annotations have only incomplete/partial support, primarily relating to th
 |Purpose
 |Layer
 
-|`@Aggregated`
-|Indicates that the object is aggregated, or wholly owned, by a root object. +
-
-This information could in theory provide useful semantics for some object store implementations, eg to store the aggregated objects "inline".  +
-
-Currently neither the JDO ObjectStore nor any of the viewers exploit this metadata.
-|Domain, Persistence
 
 |`@Defaulted`
 |Indicates that a (value) class has a default value. +
diff --git a/core/applib/src/main/java/org/apache/isis/applib/adapters/ValueSemanticsProvider.java b/core/applib/src/main/java/org/apache/isis/applib/adapters/ValueSemanticsProvider.java
index c062cba..7bc6e5f 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/adapters/ValueSemanticsProvider.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/adapters/ValueSemanticsProvider.java
@@ -21,7 +21,6 @@ package org.apache.isis.applib.adapters;
 
 import java.math.BigDecimal;
 
-import org.apache.isis.applib.annotation.Aggregated;
 import org.apache.isis.applib.annotation.Defaulted;
 import org.apache.isis.applib.annotation.Encodable;
 import org.apache.isis.applib.annotation.EqualByContent;
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/Aggregated.java b/core/applib/src/main/java/org/apache/isis/applib/annotation/Aggregated.java
deleted file mode 100644
index 802016b..0000000
--- a/core/applib/src/main/java/org/apache/isis/applib/annotation/Aggregated.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-
-package org.apache.isis.applib.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * @deprecated - this annotation is no longer supported; the framework will throw a validation exception (and fail-fast) if the annotation is found.
- */
-@Deprecated
-@Inherited
-@Target({ ElementType.TYPE })
-@Retention(RetentionPolicy.RUNTIME)
-public @interface Aggregated {
-}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parented/aggregated/AggregatedAnnotationFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parented/aggregated/AggregatedAnnotationFactory.java
deleted file mode 100644
index 0780302..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parented/aggregated/AggregatedAnnotationFactory.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-
-package org.apache.isis.core.metamodel.facets.object.parented.aggregated;
-
-import java.util.List;
-
-import com.google.common.collect.Lists;
-
-import org.apache.isis.applib.annotation.Aggregated;
-import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.metamodel.facetapi.FeatureType;
-import org.apache.isis.core.metamodel.facetapi.MetaModelValidatorRefiner;
-import org.apache.isis.core.metamodel.facets.Annotations;
-import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
-import org.apache.isis.core.metamodel.progmodel.DeprecatedMarker;
-import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorAbstract;
-import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
-import org.apache.isis.core.metamodel.specloader.validator.ValidationFailures;
-
-/**
- * The {@link Aggregated @Aggregated} annotation is no longer supported; this facet factory prevents its use.
- *
- * @deprecated
- */
-@Deprecated
-public class AggregatedAnnotationFactory extends FacetFactoryAbstract implements
-        MetaModelValidatorRefiner, DeprecatedMarker {
-
-    public AggregatedAnnotationFactory() {
-        super(FeatureType.OBJECTS_ONLY);
-    }
-
-    final List<String> classesWithAnnotation = Lists.newArrayList();
-
-    @Override
-    public void process(final ProcessClassContext processClassContext) {
-        final Class<?> cls = processClassContext.getCls();
-        final Aggregated annotation = Annotations.getAnnotation(cls, Aggregated.class);
-        if(annotation != null) {
-            classesWithAnnotation.add(cls.getName());
-        }
-    }
-
-    @Override
-    public void refineMetaModelValidator(
-            final MetaModelValidatorComposite metaModelValidator,
-            final IsisConfiguration configuration) {
-
-        metaModelValidator.add(new MetaModelValidatorAbstract() {
-            @Override
-            public void validate(final ValidationFailures validationFailures) {
-                for (String className : classesWithAnnotation) {
-                    validationFailures.add("%s has @Aggregated annotation, which is no longer supported.",
-                            className);
-                }
-            }
-        });
-    }
-}
diff --git a/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/ProgrammingModelFacetsJava5.java b/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/ProgrammingModelFacetsJava5.java
index 3a8739d..cb592dd 100644
--- a/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/ProgrammingModelFacetsJava5.java
+++ b/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/ProgrammingModelFacetsJava5.java
@@ -95,7 +95,6 @@ import org.apache.isis.core.metamodel.facets.object.notpersistable.notpersistabl
 import org.apache.isis.core.metamodel.facets.object.notpersistable.notpersistablemarkerifc.NotPersistableFacetMarkerInterfaceFactory;
 import org.apache.isis.core.metamodel.facets.object.objectspecid.classname.ObjectSpecIdFacetDerivedFromClassNameFactory;
 import org.apache.isis.core.metamodel.facets.object.objectvalidprops.impl.ObjectValidPropertiesFacetImplFactory;
-import org.apache.isis.core.metamodel.facets.object.parented.aggregated.AggregatedAnnotationFactory;
 import org.apache.isis.core.metamodel.facets.object.parseable.annotcfg.ParseableFacetAnnotationElseConfigurationFactory;
 import org.apache.isis.core.metamodel.facets.object.plural.staticmethod.PluralFacetStaticMethodFactory;
 import org.apache.isis.core.metamodel.facets.object.recreatable.DisabledFacetOnCollectionDerivedFromViewModelFacetFactory;
@@ -284,8 +283,6 @@ public final class ProgrammingModelFacetsJava5 extends ProgrammingModelAbstract
         
         addFactory(new MemberGroupLayoutFacetFactory());
 
-        addFactory(new AggregatedAnnotationFactory());
-        
         addFactory(new BookmarkPolicyFacetViaBookmarkableAnnotationElseFallbackFactory());
         addFactory(new HomePageFacetAnnotationFactory());
         addFactory(new ChoicesFacetFromBoundedMarkerInterfaceFactory());
diff --git a/core/metamodel/src/main/src-archived/progmodel-facets/AggregatedAnnotationFactory.java b/core/metamodel/src/main/src-archived/progmodel-facets/AggregatedAnnotationFactory.java
index e80d504..98b8083 100644
--- a/core/metamodel/src/main/src-archived/progmodel-facets/AggregatedAnnotationFactory.java
+++ b/core/metamodel/src/main/src-archived/progmodel-facets/AggregatedAnnotationFactory.java
@@ -20,7 +20,6 @@
 
 
 
-import org.apache.isis.applib.annotation.Aggregated;
 import org.apache.isis.noa.annotations.AggregatedAnnotation;
 import org.apache.isis.noa.annotations.Annotation;
 
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ViewModelSemanticCheckingFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ViewModelSemanticCheckingFacetFactoryTest.java
index 4f601c3..f006ed1 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ViewModelSemanticCheckingFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ViewModelSemanticCheckingFacetFactoryTest.java
@@ -46,6 +46,7 @@ public class ViewModelSemanticCheckingFacetFactoryTest {
     @Mock
     private IsisConfigurationDefault mockConfiguration;
 
+
     @Mock
     private ServicesInjector mockServicesInjector;
 
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/parented/aggregated/AggregatedAnnotationFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/parented/aggregated/AggregatedAnnotationFactoryTest.java
deleted file mode 100644
index 4103c26..0000000
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/parented/aggregated/AggregatedAnnotationFactoryTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-
-package org.apache.isis.core.metamodel.facets.object.parented.aggregated;
-
-import org.apache.isis.applib.annotation.Aggregated;
-import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryTest;
-import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessClassContext;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
-public class AggregatedAnnotationFactoryTest extends AbstractFacetFactoryTest {
-
-    private AggregatedAnnotationFactory facetFactory;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        facetFactory = new AggregatedAnnotationFactory();
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        facetFactory = null;
-        super.tearDown();
-    }
-
-    public void testAggregatedAnnotationPickedUpOnClass() {
-        @Aggregated
-        class Customer {
-        }
-
-        facetFactory.process(new ProcessClassContext(Customer.class, methodRemover, facetedMethod));
-
-        assertThat(facetFactory.classesWithAnnotation.size(), is(1));
-    }
-
-
-
-}
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/persistence/AggregatedFacetAlways.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/persistence/AggregatedFacetAlways.java
deleted file mode 100644
index 7d175d3..0000000
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/persistence/AggregatedFacetAlways.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-
-package org.apache.isis.core.runtime.persistence;
-
-import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facets.MarkerFacetAbstract;
-import org.apache.isis.core.metamodel.facets.object.parented.ParentedCollectionFacet;
-
-public class AggregatedFacetAlways extends MarkerFacetAbstract {
-
-    public AggregatedFacetAlways(final FacetHolder holder) {
-        super(ParentedCollectionFacet.class, holder);
-    }
-
-}
diff --git a/example/application/helloworld/pom.xml b/example/application/helloworld/pom.xml
index 646de10..ecbd029 100644
--- a/example/application/helloworld/pom.xml
+++ b/example/application/helloworld/pom.xml
@@ -36,7 +36,7 @@
     <packaging>war</packaging>
 
     <properties>
-        <isis.version>1.15.1</isis.version>
+        <isis.version>1.16.0-SNAPSHOT</isis.version>
 
         <lombok.version>1.16.18</lombok.version>
 
diff --git a/example/application/simpleapp/pom.xml b/example/application/simpleapp/pom.xml
index 9ee473a..bbe8d71 100644
--- a/example/application/simpleapp/pom.xml
+++ b/example/application/simpleapp/pom.xml
@@ -40,7 +40,7 @@
     </prerequisites>
 
     <properties>
-        <isis.version>1.15.1</isis.version>
+        <isis.version>1.16.0-SNAPSHOT</isis.version>
 
         <lombok.version>1.16.18</lombok.version>
 
diff --git a/todo-deprecation-list.txt b/todo-deprecation-list.txt
index d02c1bd..2e0a877 100644
--- a/todo-deprecation-list.txt
+++ b/todo-deprecation-list.txt
@@ -15,6 +15,8 @@ org.apache.isis.applib
         CollectionDomainEvent - the N arg constructors (just use the 0-arg ones)
         PropertyDomainEvent  - the N arg constructors (just use the 0-arg ones)
 
+
+
 org.apache.isis.applib.annotation
 
     ActionInteraction.java  - entire annotation, use @Action(domainEvent=...)
@@ -41,6 +43,9 @@ org.apache.isis.applib.annotation
     ActionOrder.java - entire annotation, use @MemberOrder instead
     FieldOrder.java - entire annotation, use @MemberOrder instead
 
+    Aggregated.java - entire annotation, not supported internally
+
+
     CollectionLayout.java
         render() - use @CollectionLayout(defaultView=...) instead
     RenderType.java - supporting enum for @Render annotation
@@ -88,7 +93,6 @@ org.apache.isis.applib.annotation
 
 
 
-    Aggregated.java - entire annotation, not supported internally
     NotPersistable.java - entire annotation, not supported and does nothing
 
     AutoComplete.java - entire annotation, use @DomainObject(autoComplete...=...)

-- 
To stop receiving notification emails like this one, please contact
"commits@isis.apache.org" <co...@isis.apache.org>.