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 2018/02/18 16:36:25 UTC
[isis] branch release-1.16.1-RC2 created (now 76da622)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch release-1.16.1-RC2
in repository https://gitbox.apache.org/repos/asf/isis.git.
at 76da622 [maven-release-plugin] prepare for next development iteration
This branch includes the following new commits:
new 354439f ISIS-1813: fixes java7/8 compilation issue (unused import from Java 8)
new f72981d [maven-release-plugin] prepare release isis-1.16.1
new 831b964 [maven-release-plugin] prepare for next development iteration
new 4c39bdb ISIS-1813: recreating simpleapp archetype
new 1d52c26 [maven-release-plugin] prepare release simpleapp-archetype-1.16.1
new 834f8bb [maven-release-plugin] prepare for next development iteration
new ad8d430 ISIS-1813: recreating helloworld archetype
new 160f3ae [maven-release-plugin] prepare release helloworld-archetype-1.16.1
new 88c8aaa [maven-release-plugin] prepare for next development iteration
new 0e041cf ISIS-1813: updates docs and example apps
new 403c85a ISIS-1813: updates release notes for 1.16.1
new eef5aaa Merge branch 'maint-1.16.1' into release-1.16.1-RC1
new 428bd03 ISIS-1585: associates action with collection based on either name or id
new e6f8456 Merge branch 'maint-1.16.1' into release-1.16.1-RC1
new f373b64 ISIS-1813: reverts isis.version to -SNAPSHOT for apps
new aa646ee ISIS-1813: reverts isis.version to -SNAPSHOT for archetypes
new a13700a ISIS-1813: reverts pom.xml's to 1.16.1-SNAPSHOT
new f40200c ISIS-1813: reverts pom.xml's of archetypes to 1.16.1-SNAPSHOT
new f9cd41b ISIS-1852: backports unit test to jdk 1.7
new 62ea442 ISIS-1813: updates release notes for 1.16.1
new c85a242 ISIS-1813: hides git-commit-id-plugin behind a profile, and updates the instructions for verifying releases.
new b6a12d8 [maven-release-plugin] prepare release isis-1.16.1
new 2d63d8d [maven-release-plugin] prepare for next development iteration
new 4a8214f ISIS-1813: updates simpleapp to reference 1.16.1
new f19d29f ISIS-1813: recreating simpleapp archetype
new ae624f8 [maven-release-plugin] prepare release simpleapp-archetype-1.16.1
new 059f0a0 [maven-release-plugin] prepare for next development iteration
new 801dda8 ISIS-1813: updates helloworld to reference 1.16.1
new 9006c35 ISIS-1813: recreating helloworld archetype
new b7aefec [maven-release-plugin] prepare release helloworld-archetype-1.16.1
new 76da622 [maven-release-plugin] prepare for next development iteration
The 31 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.
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.
[isis] 11/31: ISIS-1813: updates release notes for 1.16.1
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch release-1.16.1-RC2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 403c85a83a407ba4ed084b7a234a50e6f1fcb590
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Feb 14 10:32:54 2018 +0000
ISIS-1813: updates release notes for 1.16.1
---
.../release-notes/_release-notes_1.16.1.adoc | 69 ++++++++++++++++++++++
.../main/asciidoc/release-notes/release-notes.adoc | 10 ++--
2 files changed, 74 insertions(+), 5 deletions(-)
diff --git a/adocs/documentation/src/main/asciidoc/release-notes/_release-notes_1.16.1.adoc b/adocs/documentation/src/main/asciidoc/release-notes/_release-notes_1.16.1.adoc
index 6f3d27d..fe8aa51 100644
--- a/adocs/documentation/src/main/asciidoc/release-notes/_release-notes_1.16.1.adoc
+++ b/adocs/documentation/src/main/asciidoc/release-notes/_release-notes_1.16.1.adoc
@@ -22,3 +22,72 @@ The majority of the implementation is provided in the (non-ASF) (non-ASF) link:h
Applications written against v1.16.0 should run against v1.16.1 with few if any changes.
+
+
+== New Feature
+
+* link:https://issues.apache.org/jira/browse/ISIS-1861[ISIS-1861] - Extend tabgroup layout control so that a tabgroup with only one tab can show either collapsed (default) or with the one tab.
+* link:https://issues.apache.org/jira/browse/ISIS-1856[ISIS-1856] - Add git.properties and SCM-Revision into MANIFEST.MF
+* link:https://issues.apache.org/jira/browse/ISIS-1585[ISIS-1585] - Allow objects in parented collections to be selected, automatically passed as defaults for collection parameter of associated actions. Also infer choices for both scalar and collection parameters.
+* link:https://issues.apache.org/jira/browse/ISIS-1569[ISIS-1569] - Automated testing tool to replay commands against a copy of prod
+
+
+
+== Improvement
+
+* link:https://issues.apache.org/jira/browse/ISIS-1837[ISIS-1837] - Metamodel validator should check for cyclic dependencies (reference to entities that live outside of the module set)
+* link:https://issues.apache.org/jira/browse/ISIS-1836[ISIS-1836] - Better diagnostic reporting in RO viewer if passed in a non-parseable value
+* link:https://issues.apache.org/jira/browse/ISIS-1835[ISIS-1835] - Better diagnostic reporting if fail to read a configuration flie.
+* link:https://issues.apache.org/jira/browse/ISIS-1834[ISIS-1834] - Relax metamodel validation to allow @PersistenceCapable on interfaces
+* link:https://issues.apache.org/jira/browse/ISIS-1826[ISIS-1826] - Add Automatic-Module-Name to support Java 9.
+* link:https://issues.apache.org/jira/browse/ISIS-1814[ISIS-1814] - JAXB validator fails requiring @XmlJavaTypeAdapter even if annotated with @XmlTransient
+* link:https://issues.apache.org/jira/browse/ISIS-1808[ISIS-1808] - Let the error page be customisable, eg embed an image from randomkittengenerator.com
+* link:https://issues.apache.org/jira/browse/ISIS-1759[ISIS-1759] - Always calling getXxx() and hideXxx() both decreases performance of application (?)
+* link:https://issues.apache.org/jira/browse/ISIS-1743[ISIS-1743] - fa-Icon mapping for mixin provided methods not honored intuitively
+* link:https://issues.apache.org/jira/browse/ISIS-1589[ISIS-1589] - Allow layout to be loaded from either .layout.xml or .layout.fallback.xml (so that library modules can provide a default layout for their entities using XML).
+
+
+== Bug
+
+* link:https://issues.apache.org/jira/browse/ISIS-1858[ISIS-1858] - NPE when Log at Debug Level
+* link:https://issues.apache.org/jira/browse/ISIS-1857[ISIS-1857] - help block for properties/parameters with drop down actions to right encroaches on the field.
+* link:https://issues.apache.org/jira/browse/ISIS-1855[ISIS-1855] - scm entries in core pom.xml are incorrect
+* link:https://issues.apache.org/jira/browse/ISIS-1854[ISIS-1854] - menubars.layout.xml seems to ignore the embedded <Name> ?
+* link:https://issues.apache.org/jira/browse/ISIS-1853[ISIS-1853] - Fix AbstractSessionTemplate and to unmarshal collection and reference arguments.
+* link:https://issues.apache.org/jira/browse/ISIS-1852[ISIS-1852] - Iterating over query result list with parallelStream produces next exception
+* link:https://issues.apache.org/jira/browse/ISIS-1851[ISIS-1851] - Improve the dynamic visibility of PropertyGroups so works with pdf js viewer (anything that isn't a ScalarPanelAbstract2, basically).
+* link:https://issues.apache.org/jira/browse/ISIS-1848[ISIS-1848] - References of type java.lang.Object (sometimes) not rendered correctly in Wicket viewer
+* link:https://issues.apache.org/jira/browse/ISIS-1847[ISIS-1847] - Eventbus: AbstractDomainEvent incorrect veto handling?
+* link:https://issues.apache.org/jira/browse/ISIS-1833[ISIS-1833] - Mandatory marker (red asterisk) not shown on mandatory parameters
+* link:https://issues.apache.org/jira/browse/ISIS-1832[ISIS-1832] - Entering a non-valid string into a parameter of type UUID results in a stacktrace.
+* link:https://issues.apache.org/jira/browse/ISIS-1831[ISIS-1831] - If Accept header bad, then our exception handler throws an NPE and so issue of bad header is not reported.
+* link:https://issues.apache.org/jira/browse/ISIS-1829[ISIS-1829] - AppManifestAbstract#withFixtureScripts no longer works.
+* link:https://issues.apache.org/jira/browse/ISIS-1825[ISIS-1825] - @CollectionLayout(hidden=STANDALONE_COLLECTION) results in scalar panels being hidden when in parented collection, (but the column is still there, ie blank).
+* link:https://issues.apache.org/jira/browse/ISIS-1822[ISIS-1822] - non-existent action in menubars.layout.xml causes an NPE
+* link:https://issues.apache.org/jira/browse/ISIS-1820[ISIS-1820] - New style BDD tests broken in 1.16.0
+* link:https://issues.apache.org/jira/browse/ISIS-1812[ISIS-1812] - NPE when attempt to render mixed-in property as a column.
+
+
+
+== Other
+
+=== Documentation
+
+* link:https://issues.apache.org/jira/browse/ISIS-1860[ISIS-1860] - CommandReification.DISABLED is broken / incorrectly documented.
+* link:https://issues.apache.org/jira/browse/ISIS-1859[ISIS-1859] - Use of "timestamp" in JDOQL queries.
+* link:https://issues.apache.org/jira/browse/ISIS-1849[ISIS-1849] - 1.16.0 - Broken Links according to W3C checker
+
+=== Task
+
+* link:https://issues.apache.org/jira/browse/ISIS-1813[ISIS-1813] - Release tasks for 1.16.1
+
+=== Duplicates or Not Implemented
+
+* link:https://issues.apache.org/jira/browse/ISIS-1500[ISIS-1500] - [DUPLICATE] ReplayService, to directly execute a previously persisted command
+* link:https://issues.apache.org/jira/browse/ISIS-1850[ISIS-1850] - [NOT IMPLEMENTED] Rename 'default' in JSON Response
+
+=== Question
+
+* link:https://issues.apache.org/jira/browse/ISIS-1824[ISIS-1824] - menubars.layout.xml vs Wicket Viewer annotations
+
+
diff --git a/adocs/documentation/src/main/asciidoc/release-notes/release-notes.adoc b/adocs/documentation/src/main/asciidoc/release-notes/release-notes.adoc
index 8d0b71d..8caeb96 100644
--- a/adocs/documentation/src/main/asciidoc/release-notes/release-notes.adoc
+++ b/adocs/documentation/src/main/asciidoc/release-notes/release-notes.adoc
@@ -22,12 +22,12 @@ This table summarises all releases of Apache Isis to date.
| JIRA relnotes
| xref:release-notes.adoc#_release-notes_1.16.1[1.16.1]
-| xx-02-2018
+| 18-02-2018
| Parented collections with checkboxes, replay module
-| .
-| .
-| .
-| ...
+| 4
+| 10
+| 17
+| https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12342424[Release notes for v1.16.1]
| xref:release-notes.adoc#_release-notes_1.16.0[1.16.0]
| 08-01-2018
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.
[isis] 19/31: ISIS-1852: backports unit test to jdk 1.7
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch release-1.16.1-RC2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit f9cd41b5d05f35b761b1cc859a5ba9e67e390455
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Sun Feb 18 10:33:16 2018 +0000
ISIS-1852: backports unit test to jdk 1.7
---
.../runtime/services/ServiceInstantiatorTest.java | 27 ++++++++++++----------
1 file changed, 15 insertions(+), 12 deletions(-)
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/services/ServiceInstantiatorTest.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/services/ServiceInstantiatorTest.java
index 0d777c9..7dcb1b5 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/services/ServiceInstantiatorTest.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/services/ServiceInstantiatorTest.java
@@ -18,7 +18,6 @@ package org.apache.isis.core.runtime.services;
import java.util.Collections;
import java.util.List;
-import java.util.Objects;
import java.util.concurrent.BrokenBarrierException;
import java.util.concurrent.CyclicBarrier;
import java.util.concurrent.ExecutorService;
@@ -27,6 +26,8 @@ import java.util.concurrent.TimeUnit;
import javax.enterprise.context.RequestScoped;
+import com.google.common.base.Predicates;
+import com.google.common.collect.FluentIterable;
import com.google.common.collect.Lists;
import org.jmock.auto.Mock;
@@ -39,7 +40,7 @@ import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThat;
public class ServiceInstantiatorTest {
@@ -144,7 +145,7 @@ public class ServiceInstantiatorTest {
final Consumer consumer = serviceInstantiator.createInstance(Consumer.class);
- final List<Integer> allTheNumbers = Collections.synchronizedList(Lists.newArrayList());
+ final List<Integer> allTheNumbers = Collections.synchronizedList(Lists.<Integer>newArrayList());
final int n = 100;
for (int i = 0; i < n; i++) {
@@ -160,16 +161,18 @@ public class ServiceInstantiatorTest {
for (int i = 0; i < n; i++) {
final int j=i;
- execService.submit(() -> {
- try {
+ execService.submit(new Runnable() {
+ @Override public void run() {
+ try {
- // access the request scoped calculator on a child thread of 'main'
- consumer.consume(allTheNumbers, j);
+ // access the request scoped calculator on a child thread of 'main'
+ consumer.consume(allTheNumbers, j);
- } catch (Exception e) {
- System.err.println(e.getMessage());
- }
- });
+ } catch (Exception e) {
+ System.err.println(e.getMessage());
+ }
+ }
+ });
}
@@ -179,7 +182,7 @@ public class ServiceInstantiatorTest {
((RequestScopedService)consumer).__isis_endRequest();
- assertFalse(allTheNumbers.stream().anyMatch(Objects::nonNull));
+ assertEquals(0, FluentIterable.from(allTheNumbers).filter(Predicates.<Integer>notNull()).size());
}
public static class SingletonCalculator {
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.
[isis] 10/31: ISIS-1813: updates docs and example apps
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch release-1.16.1-RC2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 0e041cfb2427df0b008a14a70e90b281976b727d
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Feb 14 10:32:44 2018 +0000
ISIS-1813: updates docs and example apps
The updates to example apps WILL BE in the released archetypes for 1.16.1 RC1
---
.../src/main/asciidoc/guides/cgcom/_cgcom_cutting-a-release.adoc | 2 +-
example/application/helloworld/pom.xml | 2 +-
example/application/simpleapp/README.adoc | 2 +-
example/application/simpleapp/pom.xml | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_cutting-a-release.adoc b/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_cutting-a-release.adoc
index b5a167a..3fc0d8d 100644
--- a/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_cutting-a-release.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_cutting-a-release.adoc
@@ -478,7 +478,7 @@ mvn clean install
* can be run from an IDE
** mainClass=`org.apache.isis.WebServer`
** args=`-m domainapp.application.manifest.DomainAppAppManifestWithFixtures`
-** run before: `mvn -f pom-jdo-enhance-all.xml datanucleus:enhance -o` in the root module
+** run before: `mvn -pl module-simple datanucleus:enhance -o` in the root module
* can be run using the mvn jetty plugin:
+
diff --git a/example/application/helloworld/pom.xml b/example/application/helloworld/pom.xml
index bb2cef0..efa8848 100644
--- a/example/application/helloworld/pom.xml
+++ b/example/application/helloworld/pom.xml
@@ -36,7 +36,7 @@
<packaging>war</packaging>
<properties>
- <isis.version>1.16.1-SNAPSHOT</isis.version>
+ <isis.version>1.16.1</isis.version>
<compiler-plugin.source>1.8</compiler-plugin.source>
<compiler-plugin.target>1.8</compiler-plugin.target>
diff --git a/example/application/simpleapp/README.adoc b/example/application/simpleapp/README.adoc
index d52423d..6b62aab 100644
--- a/example/application/simpleapp/README.adoc
+++ b/example/application/simpleapp/README.adoc
@@ -70,7 +70,7 @@ Extend/adapt these according to your own standards.
+
[source,bash]
----
-mvn -f pom-jdo-enhance-all.xml datanucleus:enhance
+mvn -pl module-simple datanucleus:enhance -o
----
* To also generate the link:https://github.com/eirbjo/jetty-console[Jetty console], allowing the application to run as a standalone JAR: +
diff --git a/example/application/simpleapp/pom.xml b/example/application/simpleapp/pom.xml
index 8525106..35127f6 100644
--- a/example/application/simpleapp/pom.xml
+++ b/example/application/simpleapp/pom.xml
@@ -36,7 +36,7 @@
<packaging>pom</packaging>
<properties>
- <isis.version>1.16.1-SNAPSHOT</isis.version>
+ <isis.version>1.16.1</isis.version>
<lombok.version>1.16.18</lombok.version>
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.
[isis] 26/31: [maven-release-plugin] prepare release
simpleapp-archetype-1.16.1
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch release-1.16.1-RC2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit ae624f8463fe7c7a4f343f5b059878c41d1dee5b
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Sun Feb 18 16:19:45 2018 +0000
[maven-release-plugin] prepare release simpleapp-archetype-1.16.1
---
example/archetype/simpleapp/pom.xml | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/example/archetype/simpleapp/pom.xml b/example/archetype/simpleapp/pom.xml
index 8a26db9..777dde2 100644
--- a/example/archetype/simpleapp/pom.xml
+++ b/example/archetype/simpleapp/pom.xml
@@ -17,11 +17,11 @@
specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.isis.archetype</groupId>
<artifactId>simpleapp-archetype</artifactId>
- <version>1.16.1-SNAPSHOT</version>
+ <version>1.16.1</version>
<packaging>maven-archetype</packaging>
<name>simpleapp-archetype</name>
<build>
@@ -65,7 +65,8 @@
<connection>scm:git:git@github.com:incodehq/incode-build.git/simpleapp</connection>
<developerConnection>scm:git:git@github.com:incodehq/incode-build.git/simpleapp</developerConnection>
<url>git@github.com:incodehq/incode-build.git/simpleapp</url>
- </scm>
+ <tag>simpleapp-archetype-1.16.1</tag>
+ </scm>
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.
[isis] 17/31: ISIS-1813: reverts pom.xml's to 1.16.1-SNAPSHOT
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch release-1.16.1-RC2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit a13700af904a06477f77124d4e8a997e795daea6
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Sun Feb 18 10:27:07 2018 +0000
ISIS-1813: reverts pom.xml's to 1.16.1-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 +-
24 files changed, 60 insertions(+), 60 deletions(-)
diff --git a/core/applib/pom.xml b/core/applib/pom.xml
index 86dbc37..35328e9 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>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>isis-core-applib</artifactId>
diff --git a/core/integtestsupport/pom.xml b/core/integtestsupport/pom.xml
index 50e15c1..c1a080b 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>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>isis-core-integtestsupport</artifactId>
diff --git a/core/log4j/pom.xml b/core/log4j/pom.xml
index 115312e..5b3777c 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>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>isis-core-log4j</artifactId>
diff --git a/core/maven-plugin/pom.xml b/core/maven-plugin/pom.xml
index 3e3646b..9075531 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>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.isis.tool</groupId>
diff --git a/core/mavendeps/intellij/pom.xml b/core/mavendeps/intellij/pom.xml
index 7a387b6..91df0ef 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>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/core/mavendeps/testing/pom.xml b/core/mavendeps/testing/pom.xml
index 6504f20..d37b826 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>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/core/mavendeps/webapp/pom.xml b/core/mavendeps/webapp/pom.xml
index ddeecf4..a130a8a 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>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/core/metamodel/pom.xml b/core/metamodel/pom.xml
index 697eb3d..fb30fe1 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>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>isis-core-metamodel</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index 2606976..f65309e 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -29,7 +29,7 @@
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.1-SNAPSHOT</version>
<packaging>pom</packaging>
@@ -1146,12 +1146,12 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-unittestsupport</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-unittestsupport</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1160,14 +1160,14 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-applib</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-applib</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1176,14 +1176,14 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-schema</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-schema</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1192,7 +1192,7 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-log4j</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
@@ -1201,14 +1201,14 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-metamodel</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-metamodel</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1217,76 +1217,76 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-runtime</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-runtime</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-wrapper</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<!-- webserver -->
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-webserver</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<!-- specsupport -->
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-specsupport</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<!-- integtestsupport -->
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-integtestsupport</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<!-- Restful Objects viewer -->
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-applib</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-applib</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.1-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>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-rendering</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.1-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>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-server</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1295,12 +1295,12 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-security</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-security-shiro</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
@@ -1308,41 +1308,41 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-wicket-applib</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-wicket-model</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-wicket-model</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.1-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>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-wicket-ui</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.1-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>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-wicket-impl</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
@@ -1351,26 +1351,26 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.tool</groupId>
<artifactId>isis-maven-plugin</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<!-- Maven dependencies -->
<dependency>
<groupId>org.apache.isis.mavendeps</groupId>
<artifactId>isis-mavendeps-intellij</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.apache.isis.mavendeps</groupId>
<artifactId>isis-mavendeps-testing</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.apache.isis.mavendeps</groupId>
<artifactId>isis-mavendeps-webapp</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>pom</type>
</dependency>
diff --git a/core/runtime/pom.xml b/core/runtime/pom.xml
index 0aa0361..0b3572a 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>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>isis-core-runtime</artifactId>
diff --git a/core/schema/pom.xml b/core/schema/pom.xml
index 73b432f..c95ffe4 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>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>isis-core-schema</artifactId>
diff --git a/core/security-shiro/pom.xml b/core/security-shiro/pom.xml
index 13535bb..0c86741 100644
--- a/core/security-shiro/pom.xml
+++ b/core/security-shiro/pom.xml
@@ -23,11 +23,11 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>isis-core-security-shiro</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.1-SNAPSHOT</version>
<name>Apache Isis Security Shiro</name>
@@ -70,7 +70,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-security-shiro</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
</dependencies>
</dependencyManagement>
diff --git a/core/security/pom.xml b/core/security/pom.xml
index 03fc5e7..037183b 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>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>isis-core-security</artifactId>
diff --git a/core/specsupport/pom.xml b/core/specsupport/pom.xml
index 6ae7e18..5be87d9 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>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>isis-core-specsupport</artifactId>
diff --git a/core/unittestsupport/pom.xml b/core/unittestsupport/pom.xml
index 25ddbfb..9433d7c 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>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.1-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 e3206ae..2e63b6f 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>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.1-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 7a9feb3..375eba8 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>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.1-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 1bae1d0..d082c0a 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>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.1-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 a415304..5c1e359 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>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>isis-core-viewer-wicket-applib</artifactId>
diff --git a/core/viewer-wicket-impl/pom.xml b/core/viewer-wicket-impl/pom.xml
index 9c11554..2136550 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>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.1-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 aa7a091..70d43e4 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>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.1-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 edf4621..e0b2931 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>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>isis-core-viewer-wicket-ui</artifactId>
diff --git a/core/webserver/pom.xml b/core/webserver/pom.xml
index 24ec1d8..2530ba6 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>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>isis-core-webserver</artifactId>
diff --git a/core/wrapper/pom.xml b/core/wrapper/pom.xml
index 3d2f9a8..2901ff5 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>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>isis-core-wrapper</artifactId>
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.
[isis] 20/31: ISIS-1813: updates release notes for 1.16.1
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch release-1.16.1-RC2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 62ea44247db71f1a4669cb0eab85bbd6c69fad23
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Sun Feb 18 10:41:49 2018 +0000
ISIS-1813: updates release notes for 1.16.1
---
.../asciidoc/release-notes/_release-notes_1.16.1.adoc | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/adocs/documentation/src/main/asciidoc/release-notes/_release-notes_1.16.1.adoc b/adocs/documentation/src/main/asciidoc/release-notes/_release-notes_1.16.1.adoc
index fe8aa51..fb5993e 100644
--- a/adocs/documentation/src/main/asciidoc/release-notes/_release-notes_1.16.1.adoc
+++ b/adocs/documentation/src/main/asciidoc/release-notes/_release-notes_1.16.1.adoc
@@ -81,10 +81,21 @@ Applications written against v1.16.0 should run against v1.16.1 with few if any
* link:https://issues.apache.org/jira/browse/ISIS-1813[ISIS-1813] - Release tasks for 1.16.1
-=== Duplicates or Not Implemented
+=== Duplicates / Won't Fix / Not Implemented
-* link:https://issues.apache.org/jira/browse/ISIS-1500[ISIS-1500] - [DUPLICATE] ReplayService, to directly execute a previously persisted command
* link:https://issues.apache.org/jira/browse/ISIS-1850[ISIS-1850] - [NOT IMPLEMENTED] Rename 'default' in JSON Response
+* link:https://issues.apache.org/jira/browse/ISIS-1500[ISIS-1500] - [DUPLICATE] ReplayService, to directly execute a previously persisted command
+* link:https://issues.apache.org/jira/browse/ISIS-1395[ISIS-1395] - [WON'T FIX] Bulk actions button is shown for a collection, even if not in table view (eg showing collection as a map)
+* link:https://issues.apache.org/jira/browse/ISIS-1200[ISIS-1200] - [DUPLICATE] Improve support for BDD tests, factoring out domain service to act as context.
+* link:https://issues.apache.org/jira/browse/ISIS-1035[ISIS-1035] - [DUPLICATE] Allow parented collections to have bulk actions associated with them...
+* link:https://issues.apache.org/jira/browse/ISIS-926[ISIS-926] - [WON'T FIX] Allow integration tests to run in parallel, each with a different user. Part of this to include a ProgrammableClockService as a replacement for ClockService, partiitioned by user (to allow concurrent integration tests to run etc).
+* link:https://issues.apache.org/jira/browse/ISIS-834[ISIS-834] - [WON'T FIX] Ensure that only a single implementation of a DomainService is registered.
+* link:https://issues.apache.org/jira/browse/ISIS-804[ISIS-804] - [INVALID] Make (entity) properties read-only by default.
+* link:https://issues.apache.org/jira/browse/ISIS-689[ISIS-689] - [WON'T FIX] Bulk action take arguments
+* link:https://issues.apache.org/jira/browse/ISIS-516[ISIS-516] - [DUPLICATE] Wicket: be able to invoke @Bulk on items within a parent collection (already supported for standalone collections)
+* link:https://issues.apache.org/jira/browse/ISIS-514[ISIS-514] - [WON'T FIX] [DUPLICATE] Feature: Allow @Bulk actions to accept parameters
+* link:https://issues.apache.org/jira/browse/ISIS-505[ISIS-505] - [INVALID] Wicket error handling returns only a 500 if encounter an unenhanced object
+
=== Question
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.
[isis] 14/31: Merge branch 'maint-1.16.1' into release-1.16.1-RC1
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch release-1.16.1-RC2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit e6f8456b9ebd58200110f68c7abfe6c9104d05d0
Merge: 428bd03 3e3ad2b
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Sun Feb 18 10:17:05 2018 +0000
Merge branch 'maint-1.16.1' into release-1.16.1-RC1
.../core/runtime/services/ServiceInstantiator.java | 6 +-
.../runtime/services/ServiceInstantiatorTest.java | 291 +++++++++++++--------
2 files changed, 182 insertions(+), 115 deletions(-)
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.
[isis] 27/31: [maven-release-plugin] prepare for next development
iteration
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch release-1.16.1-RC2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 059f0a0f1618939973c80b98e6e21fa128e60291
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Sun Feb 18 16:19:48 2018 +0000
[maven-release-plugin] prepare for next development iteration
---
example/archetype/simpleapp/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/example/archetype/simpleapp/pom.xml b/example/archetype/simpleapp/pom.xml
index 777dde2..cc04125 100644
--- a/example/archetype/simpleapp/pom.xml
+++ b/example/archetype/simpleapp/pom.xml
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.isis.archetype</groupId>
<artifactId>simpleapp-archetype</artifactId>
- <version>1.16.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
<packaging>maven-archetype</packaging>
<name>simpleapp-archetype</name>
<build>
@@ -65,7 +65,7 @@
<connection>scm:git:git@github.com:incodehq/incode-build.git/simpleapp</connection>
<developerConnection>scm:git:git@github.com:incodehq/incode-build.git/simpleapp</developerConnection>
<url>git@github.com:incodehq/incode-build.git/simpleapp</url>
- <tag>simpleapp-archetype-1.16.1</tag>
+ <tag>HEAD</tag>
</scm>
<parent>
<groupId>org.apache.isis.core</groupId>
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.
[isis] 29/31: ISIS-1813: recreating helloworld archetype
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch release-1.16.1-RC2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 9006c35152ef59af9897bb3df462d0b5f6124df6
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Sun Feb 18 16:25:42 2018 +0000
ISIS-1813: recreating helloworld archetype
---
example/archetype/helloworld/pom.xml | 7 +++----
.../src/test/resources/projects/basic/archetype.properties | 2 +-
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/example/archetype/helloworld/pom.xml b/example/archetype/helloworld/pom.xml
index 1c1021c..dbf6eed 100644
--- a/example/archetype/helloworld/pom.xml
+++ b/example/archetype/helloworld/pom.xml
@@ -17,7 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.isis.archetype</groupId>
<artifactId>helloworld-archetype</artifactId>
@@ -65,12 +65,11 @@
<connection>scm:git:git@github.com:incodehq/incode-build.git/helloworld</connection>
<developerConnection>scm:git:git@github.com:incodehq/incode-build.git/helloworld</developerConnection>
<url>git@github.com:incodehq/incode-build.git/helloworld</url>
- <tag>HEAD</tag>
- </scm>
+ </scm>
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.16.1-SNAPSHOT</version>
+ <version>1.16.1</version>
<relativePath>../../../core/pom.xml</relativePath>
</parent>
<properties>
diff --git a/example/archetype/helloworld/src/test/resources/projects/basic/archetype.properties b/example/archetype/helloworld/src/test/resources/projects/basic/archetype.properties
index 756a23f..76223c9 100644
--- a/example/archetype/helloworld/src/test/resources/projects/basic/archetype.properties
+++ b/example/archetype/helloworld/src/test/resources/projects/basic/archetype.properties
@@ -1,4 +1,4 @@
-#Wed Feb 14 09:55:12 GMT 2018
+#Sun Feb 18 16:25:32 GMT 2018
package=it.pkg
version=0.1-SNAPSHOT
groupId=archetype.it
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.
[isis] 06/31: [maven-release-plugin] prepare for next development
iteration
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch release-1.16.1-RC2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 834f8bb46a80177df763cb3405fc1d6da632d7dc
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Feb 14 09:32:32 2018 +0000
[maven-release-plugin] prepare for next development iteration
---
example/archetype/simpleapp/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/example/archetype/simpleapp/pom.xml b/example/archetype/simpleapp/pom.xml
index 777dde2..cc04125 100644
--- a/example/archetype/simpleapp/pom.xml
+++ b/example/archetype/simpleapp/pom.xml
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.isis.archetype</groupId>
<artifactId>simpleapp-archetype</artifactId>
- <version>1.16.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
<packaging>maven-archetype</packaging>
<name>simpleapp-archetype</name>
<build>
@@ -65,7 +65,7 @@
<connection>scm:git:git@github.com:incodehq/incode-build.git/simpleapp</connection>
<developerConnection>scm:git:git@github.com:incodehq/incode-build.git/simpleapp</developerConnection>
<url>git@github.com:incodehq/incode-build.git/simpleapp</url>
- <tag>simpleapp-archetype-1.16.1</tag>
+ <tag>HEAD</tag>
</scm>
<parent>
<groupId>org.apache.isis.core</groupId>
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.
[isis] 18/31: ISIS-1813: reverts pom.xml's of archetypes to
1.16.1-SNAPSHOT
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch release-1.16.1-RC2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit f40200cb4f519138d8e64e77a55d7e8bca6b7e77
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Sun Feb 18 10:28:16 2018 +0000
ISIS-1813: reverts pom.xml's of archetypes to 1.16.1-SNAPSHOT
---
example/archetype/helloworld/pom.xml | 2 +-
example/archetype/simpleapp/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/example/archetype/helloworld/pom.xml b/example/archetype/helloworld/pom.xml
index 3447a45..1c1021c 100644
--- a/example/archetype/helloworld/pom.xml
+++ b/example/archetype/helloworld/pom.xml
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.isis.archetype</groupId>
<artifactId>helloworld-archetype</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.1-SNAPSHOT</version>
<packaging>maven-archetype</packaging>
<name>helloworld-archetype</name>
<build>
diff --git a/example/archetype/simpleapp/pom.xml b/example/archetype/simpleapp/pom.xml
index 9749af2..0b4e890 100644
--- a/example/archetype/simpleapp/pom.xml
+++ b/example/archetype/simpleapp/pom.xml
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.isis.archetype</groupId>
<artifactId>simpleapp-archetype</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.1-SNAPSHOT</version>
<packaging>maven-archetype</packaging>
<name>simpleapp-archetype</name>
<build>
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.
[isis] 22/31: [maven-release-plugin] prepare release isis-1.16.1
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch release-1.16.1-RC2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit b6a12d833509c548352c419a98de1bf603cf8095
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Sun Feb 18 15:39:34 2018 +0000
[maven-release-plugin] prepare release isis-1.16.1
---
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 | 72 ++++++++++++++--------------
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 +-
24 files changed, 61 insertions(+), 61 deletions(-)
diff --git a/core/applib/pom.xml b/core/applib/pom.xml
index 35328e9..2b3001c 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.1-SNAPSHOT</version>
+ <version>1.16.1</version>
</parent>
<artifactId>isis-core-applib</artifactId>
diff --git a/core/integtestsupport/pom.xml b/core/integtestsupport/pom.xml
index c1a080b..a1811eb 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.1-SNAPSHOT</version>
+ <version>1.16.1</version>
</parent>
<artifactId>isis-core-integtestsupport</artifactId>
diff --git a/core/log4j/pom.xml b/core/log4j/pom.xml
index 5b3777c..159c0b5 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.1-SNAPSHOT</version>
+ <version>1.16.1</version>
</parent>
<artifactId>isis-core-log4j</artifactId>
diff --git a/core/maven-plugin/pom.xml b/core/maven-plugin/pom.xml
index 9075531..d8fc83a 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.1-SNAPSHOT</version>
+ <version>1.16.1</version>
</parent>
<groupId>org.apache.isis.tool</groupId>
diff --git a/core/mavendeps/intellij/pom.xml b/core/mavendeps/intellij/pom.xml
index 91df0ef..e33d0d4 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.1-SNAPSHOT</version>
+ <version>1.16.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/core/mavendeps/testing/pom.xml b/core/mavendeps/testing/pom.xml
index d37b826..8d04f5e 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.1-SNAPSHOT</version>
+ <version>1.16.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/core/mavendeps/webapp/pom.xml b/core/mavendeps/webapp/pom.xml
index a130a8a..e3e2cdd 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.1-SNAPSHOT</version>
+ <version>1.16.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/core/metamodel/pom.xml b/core/metamodel/pom.xml
index fb30fe1..aac030e 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.1-SNAPSHOT</version>
+ <version>1.16.1</version>
</parent>
<artifactId>isis-core-metamodel</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index 346864a..769b51f 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.1-SNAPSHOT</version>
+ <version>1.16.1</version>
<packaging>pom</packaging>
@@ -190,7 +190,7 @@
<connection>scm:git:http://github.com/apache/isis.git</connection>
<developerConnection>scm:git:https://github.com/apache/isis.git</developerConnection>
<url>http://github.com/apache/isis</url>
- <tag>HEAD</tag>
+ <tag>isis-1.16.1</tag>
</scm>
<url>http://isis.apache.org</url>
@@ -1141,12 +1141,12 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-unittestsupport</artifactId>
- <version>1.16.1-SNAPSHOT</version>
+ <version>1.16.1</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-unittestsupport</artifactId>
- <version>1.16.1-SNAPSHOT</version>
+ <version>1.16.1</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1155,14 +1155,14 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-applib</artifactId>
- <version>1.16.1-SNAPSHOT</version>
+ <version>1.16.1</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-applib</artifactId>
- <version>1.16.1-SNAPSHOT</version>
+ <version>1.16.1</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1171,14 +1171,14 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-schema</artifactId>
- <version>1.16.1-SNAPSHOT</version>
+ <version>1.16.1</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-schema</artifactId>
- <version>1.16.1-SNAPSHOT</version>
+ <version>1.16.1</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1187,7 +1187,7 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-log4j</artifactId>
- <version>1.16.1-SNAPSHOT</version>
+ <version>1.16.1</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
@@ -1196,14 +1196,14 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-metamodel</artifactId>
- <version>1.16.1-SNAPSHOT</version>
+ <version>1.16.1</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-metamodel</artifactId>
- <version>1.16.1-SNAPSHOT</version>
+ <version>1.16.1</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1212,76 +1212,76 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-runtime</artifactId>
- <version>1.16.1-SNAPSHOT</version>
+ <version>1.16.1</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-runtime</artifactId>
- <version>1.16.1-SNAPSHOT</version>
+ <version>1.16.1</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-wrapper</artifactId>
- <version>1.16.1-SNAPSHOT</version>
+ <version>1.16.1</version>
</dependency>
<!-- webserver -->
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-webserver</artifactId>
- <version>1.16.1-SNAPSHOT</version>
+ <version>1.16.1</version>
</dependency>
<!-- specsupport -->
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-specsupport</artifactId>
- <version>1.16.1-SNAPSHOT</version>
+ <version>1.16.1</version>
</dependency>
<!-- integtestsupport -->
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-integtestsupport</artifactId>
- <version>1.16.1-SNAPSHOT</version>
+ <version>1.16.1</version>
</dependency>
<!-- Restful Objects viewer -->
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-applib</artifactId>
- <version>1.16.1-SNAPSHOT</version>
+ <version>1.16.1</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-applib</artifactId>
- <version>1.16.1-SNAPSHOT</version>
+ <version>1.16.1</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.1-SNAPSHOT</version>
+ <version>1.16.1</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-rendering</artifactId>
- <version>1.16.1-SNAPSHOT</version>
+ <version>1.16.1</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.1-SNAPSHOT</version>
+ <version>1.16.1</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-server</artifactId>
- <version>1.16.1-SNAPSHOT</version>
+ <version>1.16.1</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1290,12 +1290,12 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-security</artifactId>
- <version>1.16.1-SNAPSHOT</version>
+ <version>1.16.1</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-security-shiro</artifactId>
- <version>1.16.1-SNAPSHOT</version>
+ <version>1.16.1</version>
</dependency>
@@ -1303,41 +1303,41 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-wicket-applib</artifactId>
- <version>1.16.1-SNAPSHOT</version>
+ <version>1.16.1</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-wicket-model</artifactId>
- <version>1.16.1-SNAPSHOT</version>
+ <version>1.16.1</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-wicket-model</artifactId>
- <version>1.16.1-SNAPSHOT</version>
+ <version>1.16.1</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.1-SNAPSHOT</version>
+ <version>1.16.1</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-wicket-ui</artifactId>
- <version>1.16.1-SNAPSHOT</version>
+ <version>1.16.1</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.1-SNAPSHOT</version>
+ <version>1.16.1</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-wicket-impl</artifactId>
- <version>1.16.1-SNAPSHOT</version>
+ <version>1.16.1</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
@@ -1346,26 +1346,26 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.tool</groupId>
<artifactId>isis-maven-plugin</artifactId>
- <version>1.16.1-SNAPSHOT</version>
+ <version>1.16.1</version>
</dependency>
<!-- Maven dependencies -->
<dependency>
<groupId>org.apache.isis.mavendeps</groupId>
<artifactId>isis-mavendeps-intellij</artifactId>
- <version>1.16.1-SNAPSHOT</version>
+ <version>1.16.1</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.apache.isis.mavendeps</groupId>
<artifactId>isis-mavendeps-testing</artifactId>
- <version>1.16.1-SNAPSHOT</version>
+ <version>1.16.1</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.apache.isis.mavendeps</groupId>
<artifactId>isis-mavendeps-webapp</artifactId>
- <version>1.16.1-SNAPSHOT</version>
+ <version>1.16.1</version>
<type>pom</type>
</dependency>
diff --git a/core/runtime/pom.xml b/core/runtime/pom.xml
index 0b3572a..53a1d5b 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.1-SNAPSHOT</version>
+ <version>1.16.1</version>
</parent>
<artifactId>isis-core-runtime</artifactId>
diff --git a/core/schema/pom.xml b/core/schema/pom.xml
index c95ffe4..25d01af 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.1-SNAPSHOT</version>
+ <version>1.16.1</version>
</parent>
<artifactId>isis-core-schema</artifactId>
diff --git a/core/security-shiro/pom.xml b/core/security-shiro/pom.xml
index 0c86741..cd643b1 100644
--- a/core/security-shiro/pom.xml
+++ b/core/security-shiro/pom.xml
@@ -23,11 +23,11 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.16.1-SNAPSHOT</version>
+ <version>1.16.1</version>
</parent>
<artifactId>isis-core-security-shiro</artifactId>
- <version>1.16.1-SNAPSHOT</version>
+ <version>1.16.1</version>
<name>Apache Isis Security Shiro</name>
@@ -70,7 +70,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-security-shiro</artifactId>
- <version>1.16.1-SNAPSHOT</version>
+ <version>1.16.1</version>
</dependency>
</dependencies>
</dependencyManagement>
diff --git a/core/security/pom.xml b/core/security/pom.xml
index 037183b..8094779 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.1-SNAPSHOT</version>
+ <version>1.16.1</version>
</parent>
<artifactId>isis-core-security</artifactId>
diff --git a/core/specsupport/pom.xml b/core/specsupport/pom.xml
index 5be87d9..f61fd65 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.1-SNAPSHOT</version>
+ <version>1.16.1</version>
</parent>
<artifactId>isis-core-specsupport</artifactId>
diff --git a/core/unittestsupport/pom.xml b/core/unittestsupport/pom.xml
index 9433d7c..53f70ea 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.1-SNAPSHOT</version>
+ <version>1.16.1</version>
</parent>
<artifactId>isis-core-unittestsupport</artifactId>
diff --git a/core/viewer-restfulobjects-applib/pom.xml b/core/viewer-restfulobjects-applib/pom.xml
index 2e63b6f..1a606c6 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.1-SNAPSHOT</version>
+ <version>1.16.1</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 375eba8..de08f73 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.1-SNAPSHOT</version>
+ <version>1.16.1</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 d082c0a..6afe0d1 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.1-SNAPSHOT</version>
+ <version>1.16.1</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 5c1e359..6842bbb 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.1-SNAPSHOT</version>
+ <version>1.16.1</version>
</parent>
<artifactId>isis-core-viewer-wicket-applib</artifactId>
diff --git a/core/viewer-wicket-impl/pom.xml b/core/viewer-wicket-impl/pom.xml
index 2136550..aff26d4 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.1-SNAPSHOT</version>
+ <version>1.16.1</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 70d43e4..862cbb7 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.1-SNAPSHOT</version>
+ <version>1.16.1</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 e0b2931..ba782c0 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.1-SNAPSHOT</version>
+ <version>1.16.1</version>
</parent>
<artifactId>isis-core-viewer-wicket-ui</artifactId>
diff --git a/core/webserver/pom.xml b/core/webserver/pom.xml
index 2530ba6..67f27a5 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.1-SNAPSHOT</version>
+ <version>1.16.1</version>
</parent>
<artifactId>isis-core-webserver</artifactId>
diff --git a/core/wrapper/pom.xml b/core/wrapper/pom.xml
index 2901ff5..590ce4f 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.1-SNAPSHOT</version>
+ <version>1.16.1</version>
</parent>
<artifactId>isis-core-wrapper</artifactId>
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.
[isis] 24/31: ISIS-1813: updates simpleapp to reference 1.16.1
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch release-1.16.1-RC2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 4a8214f61f1c235dc753a87097e9140a38dc0c36
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Sun Feb 18 16:14:42 2018 +0000
ISIS-1813: updates simpleapp to reference 1.16.1
---
example/application/simpleapp/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/example/application/simpleapp/pom.xml b/example/application/simpleapp/pom.xml
index 8525106..35127f6 100644
--- a/example/application/simpleapp/pom.xml
+++ b/example/application/simpleapp/pom.xml
@@ -36,7 +36,7 @@
<packaging>pom</packaging>
<properties>
- <isis.version>1.16.1-SNAPSHOT</isis.version>
+ <isis.version>1.16.1</isis.version>
<lombok.version>1.16.18</lombok.version>
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.
[isis] 09/31: [maven-release-plugin] prepare for next development
iteration
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch release-1.16.1-RC2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 88c8aaa620e4fb0be5e72e6ef692026697bc7415
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Feb 14 09:59:28 2018 +0000
[maven-release-plugin] prepare for next development iteration
---
example/archetype/helloworld/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/example/archetype/helloworld/pom.xml b/example/archetype/helloworld/pom.xml
index 9ffb224..5f84e1f 100644
--- a/example/archetype/helloworld/pom.xml
+++ b/example/archetype/helloworld/pom.xml
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.isis.archetype</groupId>
<artifactId>helloworld-archetype</artifactId>
- <version>1.16.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
<packaging>maven-archetype</packaging>
<name>helloworld-archetype</name>
<build>
@@ -65,7 +65,7 @@
<connection>scm:git:git@github.com:incodehq/incode-build.git/helloworld</connection>
<developerConnection>scm:git:git@github.com:incodehq/incode-build.git/helloworld</developerConnection>
<url>git@github.com:incodehq/incode-build.git/helloworld</url>
- <tag>helloworld-archetype-1.16.1</tag>
+ <tag>HEAD</tag>
</scm>
<parent>
<groupId>org.apache.isis.core</groupId>
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.
[isis] 16/31: ISIS-1813: reverts isis.version to -SNAPSHOT for
archetypes
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch release-1.16.1-RC2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit aa646ee1dd2d1c4c3468a50fce287a39cd86ef35
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Sun Feb 18 10:25:46 2018 +0000
ISIS-1813: reverts isis.version to -SNAPSHOT for archetypes
---
example/archetype/helloworld/pom.xml | 2 +-
example/archetype/simpleapp/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/example/archetype/helloworld/pom.xml b/example/archetype/helloworld/pom.xml
index 5f84e1f..3447a45 100644
--- a/example/archetype/helloworld/pom.xml
+++ b/example/archetype/helloworld/pom.xml
@@ -70,7 +70,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.16.1</version>
+ <version>1.16.1-SNAPSHOT</version>
<relativePath>../../../core/pom.xml</relativePath>
</parent>
<properties>
diff --git a/example/archetype/simpleapp/pom.xml b/example/archetype/simpleapp/pom.xml
index cc04125..9749af2 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.16.1</version>
+ <version>1.16.1-SNAPSHOT</version>
<relativePath>../../../core/pom.xml</relativePath>
</parent>
<properties>
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.
[isis] 28/31: ISIS-1813: updates helloworld to reference 1.16.1
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch release-1.16.1-RC2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 801dda85331122a2328d8770e677edd867e8154d
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Sun Feb 18 16:23:31 2018 +0000
ISIS-1813: updates helloworld to reference 1.16.1
---
example/application/helloworld/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/example/application/helloworld/pom.xml b/example/application/helloworld/pom.xml
index bb2cef0..efa8848 100644
--- a/example/application/helloworld/pom.xml
+++ b/example/application/helloworld/pom.xml
@@ -36,7 +36,7 @@
<packaging>war</packaging>
<properties>
- <isis.version>1.16.1-SNAPSHOT</isis.version>
+ <isis.version>1.16.1</isis.version>
<compiler-plugin.source>1.8</compiler-plugin.source>
<compiler-plugin.target>1.8</compiler-plugin.target>
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.
[isis] 08/31: [maven-release-plugin] prepare release
helloworld-archetype-1.16.1
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch release-1.16.1-RC2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 160f3ae15dc27c0fd32e6c5245892a9e6aaa0b89
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Feb 14 09:59:25 2018 +0000
[maven-release-plugin] prepare release helloworld-archetype-1.16.1
---
example/archetype/helloworld/pom.xml | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/example/archetype/helloworld/pom.xml b/example/archetype/helloworld/pom.xml
index dbf6eed..9ffb224 100644
--- a/example/archetype/helloworld/pom.xml
+++ b/example/archetype/helloworld/pom.xml
@@ -17,11 +17,11 @@
specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.isis.archetype</groupId>
<artifactId>helloworld-archetype</artifactId>
- <version>1.16.1-SNAPSHOT</version>
+ <version>1.16.1</version>
<packaging>maven-archetype</packaging>
<name>helloworld-archetype</name>
<build>
@@ -65,7 +65,8 @@
<connection>scm:git:git@github.com:incodehq/incode-build.git/helloworld</connection>
<developerConnection>scm:git:git@github.com:incodehq/incode-build.git/helloworld</developerConnection>
<url>git@github.com:incodehq/incode-build.git/helloworld</url>
- </scm>
+ <tag>helloworld-archetype-1.16.1</tag>
+ </scm>
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.
[isis] 13/31: ISIS-1585: associates action with collection based on
either name or id
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch release-1.16.1-RC2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 428bd03ddfe077e7fad34158785beeeeea1a8990
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Sun Feb 18 10:07:03 2018 +0000
ISIS-1585: associates action with collection based on either name or id
---
...onParameterDefaultsAndChoicesPostProcessor.java | 2 +-
.../core/metamodel/spec/feature/ObjectAction.java | 29 ++++++++++++++--------
.../wicket/model/mementos/CollectionMemento.java | 25 +++++++++++++------
.../wicket/model/models/EntityCollectionModel.java | 12 ++++++++-
.../collection/AssociatedWithActionsHelper.java | 8 ++++--
5 files changed, 53 insertions(+), 23 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/param/ActionCollectionParameterDefaultsAndChoicesPostProcessor.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/param/ActionCollectionParameterDefaultsAndChoicesPostProcessor.java
index 75e177c..56c34e8 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/param/ActionCollectionParameterDefaultsAndChoicesPostProcessor.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/param/ActionCollectionParameterDefaultsAndChoicesPostProcessor.java
@@ -83,7 +83,7 @@ public class ActionCollectionParameterDefaultsAndChoicesPostProcessor implements
new ObjectActionParameter.Predicates.CollectionParameter(specification);
final ImmutableList<ObjectAction> actions = FluentIterable.from(objectActions)
- .filter(ObjectAction.Predicates.associatedWith(collectionId))
+ .filter(ObjectAction.Predicates.associatedWith(otma))
.toList();
for (final ObjectAction action : actions) {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAction.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAction.java
index bbdbeb4..acdc126 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAction.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAction.java
@@ -418,16 +418,17 @@ public interface ObjectAction extends ObjectMember {
return org.apache.isis.applib.filter.Filters.asPredicate(Filters.memberOrderOf(association));
}
- public static Predicate<ObjectAction> associatedWith(final String collectionName) {
- return new AssociatedWith(collectionName);
+ public static Predicate<ObjectAction> associatedWith(final ObjectAssociation objectAssociation) {
+ return new AssociatedWith(objectAssociation);
}
public static Predicate<ObjectAction> associatedWithAndWithCollectionParameterFor(
- final String collectionName,
- final ObjectSpecification collectionTypeOfSpec) {
+ final OneToManyAssociation collection) {
+
+ final ObjectSpecification collectionTypeOfSpec = collection.getSpecification();
return com.google.common.base.Predicates.and(
- new AssociatedWith(collectionName),
+ new AssociatedWith(collection),
new HasParameterMatching(
new ObjectActionParameter.Predicates.CollectionParameter(collectionTypeOfSpec)
)
@@ -435,9 +436,12 @@ public interface ObjectAction extends ObjectMember {
}
public static class AssociatedWith implements Predicate<ObjectAction> {
- private final String memberNameAssociatedWith;
- public AssociatedWith(final String memberNameAssociatedWith) {
- this.memberNameAssociatedWith = memberNameAssociatedWith;
+ private final String memberId;
+ private final String memberName;
+
+ public AssociatedWith(final ObjectAssociation objectAssociation) {
+ this.memberId = objectAssociation.getId();
+ this.memberName = objectAssociation.getName();
}
@Override
@@ -446,10 +450,13 @@ public interface ObjectAction extends ObjectMember {
if(memberOrderFacet == null) {
return false;
}
- final String name = memberNameAssociatedWith;
final String memberOrderName = memberOrderFacet.untranslatedName();
- return name != null && memberOrderName != null &&
- Objects.equal(name.toLowerCase(), memberOrderName.toLowerCase());
+ if (memberOrderName == null) {
+ return false;
+ }
+ final String memberOrderNameLowerCase = memberOrderName.toLowerCase();
+ return memberName != null && Objects.equal(memberName.toLowerCase(), memberOrderNameLowerCase) ||
+ memberId != null && Objects.equal(memberId.toLowerCase(), memberOrderNameLowerCase);
}
}
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/CollectionMemento.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/CollectionMemento.java
index 8b17d53..49da0d8 100644
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/CollectionMemento.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/CollectionMemento.java
@@ -44,15 +44,11 @@ public class CollectionMemento implements Serializable {
private final ObjectSpecId owningType;
private final String id;
+ private final String collectionId;
+ private final String collectionName;
private transient OneToManyAssociation collection;
- public CollectionMemento(
- final ObjectSpecId owningType,
- final String id, final SpecificationLoader specificationLoader) {
- this(owningType, id, collectionFor(owningType, id, specificationLoader));
- }
-
public CollectionMemento(final OneToManyAssociation collection, final IsisSessionFactory isisSessionFactory) {
this(owningSpecFor(collection, isisSessionFactory).getSpecId(), collection.getIdentifier().toNameIdentityString(), collection);
}
@@ -61,6 +57,8 @@ public class CollectionMemento implements Serializable {
this.owningType = owningType;
this.id = id;
this.collection = collection;
+ this.collectionId = collection.getId();
+ this.collectionName = collection.getName();
}
public ObjectSpecId getOwningType() {
@@ -78,8 +76,19 @@ public class CollectionMemento implements Serializable {
return id;
}
- public String getName(final SpecificationLoader specificationLoader) {
- return getCollection(specificationLoader).getName();
+ /**
+ * {@link OneToManyAssociation#getId() id} of the {@link OneToManyAssociation collection} passed into the constructor.
+ *
+ * <p>
+ * Is (I think) the same value as {@link #getId()}, though derived more directly.
+ * </p>
+ */
+ public String getCollectionId() {
+ return collectionId;
+ }
+
+ public String getCollectionName() {
+ return collectionName;
}
public OneToManyAssociation getCollection(final SpecificationLoader specificationLoader) {
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java
index e40d778..d9f9fb5 100644
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java
@@ -130,6 +130,11 @@ public class EntityCollectionModel extends ModelAbstract<List<ObjectAdapter>> im
}
@Override
+ public String getId(final EntityCollectionModel entityCollectionModel) {
+ return null;
+ }
+
+ @Override
public String getName(final EntityCollectionModel model) {
PluralFacet facet = model.getTypeOfSpecification().getFacet(PluralFacet.class);
return facet.value();
@@ -187,9 +192,13 @@ public class EntityCollectionModel extends ModelAbstract<List<ObjectAdapter>> im
throw new UnsupportedOperationException();
}
+ @Override public String getId(final EntityCollectionModel model) {
+ return model.getCollectionMemento().getCollectionId();
+ }
+
@Override
public String getName(EntityCollectionModel model) {
- return model.getCollectionMemento().getName(model.getSpecificationLoader());
+ return model.getCollectionMemento().getCollectionName();
}
@Override
@@ -208,6 +217,7 @@ public class EntityCollectionModel extends ModelAbstract<List<ObjectAdapter>> im
abstract void setObject(EntityCollectionModel entityCollectionModel, List<ObjectAdapter> list);
+ public abstract String getId(EntityCollectionModel entityCollectionModel);
public abstract String getName(EntityCollectionModel entityCollectionModel);
public abstract int getCount(EntityCollectionModel entityCollectionModel);
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/AssociatedWithActionsHelper.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/AssociatedWithActionsHelper.java
index 65bf609..7eac1a2 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/AssociatedWithActionsHelper.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/AssociatedWithActionsHelper.java
@@ -33,6 +33,7 @@ import org.apache.isis.core.metamodel.spec.ActionType;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.Contributed;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
+import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
import org.apache.isis.viewer.wicket.model.mementos.ObjectAdapterMemento;
import org.apache.isis.viewer.wicket.model.models.EntityCollectionModel;
@@ -53,6 +54,9 @@ public class AssociatedWithActionsHelper implements Serializable {
if(collectionModel.isStandalone()) {
return Collections.emptyList();
}
+ final OneToManyAssociation collection = collectionModel.getCollectionMemento()
+ .getCollection(isisSessionFactory.getSpecificationLoader());
+
final ObjectSpecification objectSpec = getObjectSpecification(isisSessionFactory);
final List<ActionType> actionTypes = inferActionTypes(isisSessionFactory);
@@ -60,8 +64,8 @@ public class AssociatedWithActionsHelper implements Serializable {
return FluentIterable.from(objectActions)
.filter(ObjectAction.Predicates.associatedWithAndWithCollectionParameterFor(
- collectionModel.getName(),
- collectionModel.getTypeOfSpecification()))
+ collection
+ ))
.toList();
}
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.
[isis] 01/31: ISIS-1813: fixes java7/8 compilation issue (unused
import from Java 8)
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch release-1.16.1-RC2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 354439f3c5594d49263eaa94405fe158c1ed4d92
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Feb 13 23:07:47 2018 +0000
ISIS-1813: fixes java7/8 compilation issue (unused import from Java 8)
---
.../facets/members/cssclassfa/annotprop/MixinInterceptor.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclassfa/annotprop/MixinInterceptor.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclassfa/annotprop/MixinInterceptor.java
index 18b5866..9cf92f6 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclassfa/annotprop/MixinInterceptor.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclassfa/annotprop/MixinInterceptor.java
@@ -20,8 +20,6 @@
package org.apache.isis.core.metamodel.facets.members.cssclassfa.annotprop;
import java.lang.reflect.Method;
-import java.util.List;
-import java.util.Optional;
import org.apache.isis.applib.annotation.Mixin;
import org.apache.isis.core.metamodel.facets.Annotations;
@@ -30,7 +28,7 @@ import org.apache.isis.core.metamodel.specloader.specimpl.ObjectMemberAbstract;
/**
* To solve <a href="https://issues.apache.org/jira/browse/ISIS-1743">ISIS-1743</a>.<br/>
* Could be better integrated into Isis' meta-model.
- *
+ *
* @author ahuber@apache.org
*/
class MixinInterceptor {
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.
[isis] 31/31: [maven-release-plugin] prepare for next development
iteration
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch release-1.16.1-RC2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 76da622b7d122c5fe6ac11c6be4ca7da6ae4c64e
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Sun Feb 18 16:27:11 2018 +0000
[maven-release-plugin] prepare for next development iteration
---
example/archetype/helloworld/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/example/archetype/helloworld/pom.xml b/example/archetype/helloworld/pom.xml
index 9ffb224..5f84e1f 100644
--- a/example/archetype/helloworld/pom.xml
+++ b/example/archetype/helloworld/pom.xml
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.isis.archetype</groupId>
<artifactId>helloworld-archetype</artifactId>
- <version>1.16.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
<packaging>maven-archetype</packaging>
<name>helloworld-archetype</name>
<build>
@@ -65,7 +65,7 @@
<connection>scm:git:git@github.com:incodehq/incode-build.git/helloworld</connection>
<developerConnection>scm:git:git@github.com:incodehq/incode-build.git/helloworld</developerConnection>
<url>git@github.com:incodehq/incode-build.git/helloworld</url>
- <tag>helloworld-archetype-1.16.1</tag>
+ <tag>HEAD</tag>
</scm>
<parent>
<groupId>org.apache.isis.core</groupId>
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.
[isis] 02/31: [maven-release-plugin] prepare release isis-1.16.1
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch release-1.16.1-RC2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit f72981d1708f909cb0da2d12f787b23b7e794ca0
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Feb 13 23:47:31 2018 +0000
[maven-release-plugin] prepare release isis-1.16.1
---
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 | 74 ++++++++++++++--------------
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 +-
24 files changed, 62 insertions(+), 62 deletions(-)
diff --git a/core/applib/pom.xml b/core/applib/pom.xml
index 35328e9..2b3001c 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.1-SNAPSHOT</version>
+ <version>1.16.1</version>
</parent>
<artifactId>isis-core-applib</artifactId>
diff --git a/core/integtestsupport/pom.xml b/core/integtestsupport/pom.xml
index c1a080b..a1811eb 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.1-SNAPSHOT</version>
+ <version>1.16.1</version>
</parent>
<artifactId>isis-core-integtestsupport</artifactId>
diff --git a/core/log4j/pom.xml b/core/log4j/pom.xml
index 5b3777c..159c0b5 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.1-SNAPSHOT</version>
+ <version>1.16.1</version>
</parent>
<artifactId>isis-core-log4j</artifactId>
diff --git a/core/maven-plugin/pom.xml b/core/maven-plugin/pom.xml
index 9075531..d8fc83a 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.1-SNAPSHOT</version>
+ <version>1.16.1</version>
</parent>
<groupId>org.apache.isis.tool</groupId>
diff --git a/core/mavendeps/intellij/pom.xml b/core/mavendeps/intellij/pom.xml
index 91df0ef..e33d0d4 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.1-SNAPSHOT</version>
+ <version>1.16.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/core/mavendeps/testing/pom.xml b/core/mavendeps/testing/pom.xml
index d37b826..8d04f5e 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.1-SNAPSHOT</version>
+ <version>1.16.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/core/mavendeps/webapp/pom.xml b/core/mavendeps/webapp/pom.xml
index a130a8a..e3e2cdd 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.1-SNAPSHOT</version>
+ <version>1.16.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/core/metamodel/pom.xml b/core/metamodel/pom.xml
index fb30fe1..aac030e 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.1-SNAPSHOT</version>
+ <version>1.16.1</version>
</parent>
<artifactId>isis-core-metamodel</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index 373a4fa..0e8e8cc 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.1-SNAPSHOT</version>
+ <version>1.16.1</version>
<packaging>pom</packaging>
@@ -190,7 +190,7 @@
<connection>scm:git:http://github.com/apache/isis.git</connection>
<developerConnection>scm:git:https://github.com/apache/isis.git</developerConnection>
<url>http://github.com/apache/isis</url>
- <tag>HEAD</tag>
+ <tag>isis-1.16.1</tag>
</scm>
<url>http://isis.apache.org</url>
@@ -847,7 +847,7 @@
<manifestEntries>
<Automatic-Module-Name>${jar-plugin.automaticModuleName}</Automatic-Module-Name>
<Implementation-Vendor-Id>org.apache.isis</Implementation-Vendor-Id>
- <Implementation-Vendor>Apache Isis™ Project</Implementation-Vendor>
+ <Implementation-Vendor>Apache Isis™ Project</Implementation-Vendor>
<SCM-Revision>${git.commit.id.abbrev}</SCM-Revision>
</manifestEntries>
</archive>
@@ -1146,12 +1146,12 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-unittestsupport</artifactId>
- <version>1.16.1-SNAPSHOT</version>
+ <version>1.16.1</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-unittestsupport</artifactId>
- <version>1.16.1-SNAPSHOT</version>
+ <version>1.16.1</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1160,14 +1160,14 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-applib</artifactId>
- <version>1.16.1-SNAPSHOT</version>
+ <version>1.16.1</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-applib</artifactId>
- <version>1.16.1-SNAPSHOT</version>
+ <version>1.16.1</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1176,14 +1176,14 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-schema</artifactId>
- <version>1.16.1-SNAPSHOT</version>
+ <version>1.16.1</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-schema</artifactId>
- <version>1.16.1-SNAPSHOT</version>
+ <version>1.16.1</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1192,7 +1192,7 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-log4j</artifactId>
- <version>1.16.1-SNAPSHOT</version>
+ <version>1.16.1</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
@@ -1201,14 +1201,14 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-metamodel</artifactId>
- <version>1.16.1-SNAPSHOT</version>
+ <version>1.16.1</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-metamodel</artifactId>
- <version>1.16.1-SNAPSHOT</version>
+ <version>1.16.1</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1217,76 +1217,76 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-runtime</artifactId>
- <version>1.16.1-SNAPSHOT</version>
+ <version>1.16.1</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-runtime</artifactId>
- <version>1.16.1-SNAPSHOT</version>
+ <version>1.16.1</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-wrapper</artifactId>
- <version>1.16.1-SNAPSHOT</version>
+ <version>1.16.1</version>
</dependency>
<!-- webserver -->
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-webserver</artifactId>
- <version>1.16.1-SNAPSHOT</version>
+ <version>1.16.1</version>
</dependency>
<!-- specsupport -->
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-specsupport</artifactId>
- <version>1.16.1-SNAPSHOT</version>
+ <version>1.16.1</version>
</dependency>
<!-- integtestsupport -->
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-integtestsupport</artifactId>
- <version>1.16.1-SNAPSHOT</version>
+ <version>1.16.1</version>
</dependency>
<!-- Restful Objects viewer -->
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-applib</artifactId>
- <version>1.16.1-SNAPSHOT</version>
+ <version>1.16.1</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-applib</artifactId>
- <version>1.16.1-SNAPSHOT</version>
+ <version>1.16.1</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.1-SNAPSHOT</version>
+ <version>1.16.1</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-rendering</artifactId>
- <version>1.16.1-SNAPSHOT</version>
+ <version>1.16.1</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.1-SNAPSHOT</version>
+ <version>1.16.1</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-server</artifactId>
- <version>1.16.1-SNAPSHOT</version>
+ <version>1.16.1</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1295,12 +1295,12 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-security</artifactId>
- <version>1.16.1-SNAPSHOT</version>
+ <version>1.16.1</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-security-shiro</artifactId>
- <version>1.16.1-SNAPSHOT</version>
+ <version>1.16.1</version>
</dependency>
@@ -1308,41 +1308,41 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-wicket-applib</artifactId>
- <version>1.16.1-SNAPSHOT</version>
+ <version>1.16.1</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-wicket-model</artifactId>
- <version>1.16.1-SNAPSHOT</version>
+ <version>1.16.1</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-wicket-model</artifactId>
- <version>1.16.1-SNAPSHOT</version>
+ <version>1.16.1</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.1-SNAPSHOT</version>
+ <version>1.16.1</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-wicket-ui</artifactId>
- <version>1.16.1-SNAPSHOT</version>
+ <version>1.16.1</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.1-SNAPSHOT</version>
+ <version>1.16.1</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-wicket-impl</artifactId>
- <version>1.16.1-SNAPSHOT</version>
+ <version>1.16.1</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
@@ -1351,26 +1351,26 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.tool</groupId>
<artifactId>isis-maven-plugin</artifactId>
- <version>1.16.1-SNAPSHOT</version>
+ <version>1.16.1</version>
</dependency>
<!-- Maven dependencies -->
<dependency>
<groupId>org.apache.isis.mavendeps</groupId>
<artifactId>isis-mavendeps-intellij</artifactId>
- <version>1.16.1-SNAPSHOT</version>
+ <version>1.16.1</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.apache.isis.mavendeps</groupId>
<artifactId>isis-mavendeps-testing</artifactId>
- <version>1.16.1-SNAPSHOT</version>
+ <version>1.16.1</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.apache.isis.mavendeps</groupId>
<artifactId>isis-mavendeps-webapp</artifactId>
- <version>1.16.1-SNAPSHOT</version>
+ <version>1.16.1</version>
<type>pom</type>
</dependency>
diff --git a/core/runtime/pom.xml b/core/runtime/pom.xml
index 0b3572a..53a1d5b 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.1-SNAPSHOT</version>
+ <version>1.16.1</version>
</parent>
<artifactId>isis-core-runtime</artifactId>
diff --git a/core/schema/pom.xml b/core/schema/pom.xml
index c95ffe4..25d01af 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.1-SNAPSHOT</version>
+ <version>1.16.1</version>
</parent>
<artifactId>isis-core-schema</artifactId>
diff --git a/core/security-shiro/pom.xml b/core/security-shiro/pom.xml
index 0c86741..cd643b1 100644
--- a/core/security-shiro/pom.xml
+++ b/core/security-shiro/pom.xml
@@ -23,11 +23,11 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.16.1-SNAPSHOT</version>
+ <version>1.16.1</version>
</parent>
<artifactId>isis-core-security-shiro</artifactId>
- <version>1.16.1-SNAPSHOT</version>
+ <version>1.16.1</version>
<name>Apache Isis Security Shiro</name>
@@ -70,7 +70,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-security-shiro</artifactId>
- <version>1.16.1-SNAPSHOT</version>
+ <version>1.16.1</version>
</dependency>
</dependencies>
</dependencyManagement>
diff --git a/core/security/pom.xml b/core/security/pom.xml
index 037183b..8094779 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.1-SNAPSHOT</version>
+ <version>1.16.1</version>
</parent>
<artifactId>isis-core-security</artifactId>
diff --git a/core/specsupport/pom.xml b/core/specsupport/pom.xml
index 5be87d9..f61fd65 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.1-SNAPSHOT</version>
+ <version>1.16.1</version>
</parent>
<artifactId>isis-core-specsupport</artifactId>
diff --git a/core/unittestsupport/pom.xml b/core/unittestsupport/pom.xml
index 9433d7c..53f70ea 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.1-SNAPSHOT</version>
+ <version>1.16.1</version>
</parent>
<artifactId>isis-core-unittestsupport</artifactId>
diff --git a/core/viewer-restfulobjects-applib/pom.xml b/core/viewer-restfulobjects-applib/pom.xml
index 2e63b6f..1a606c6 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.1-SNAPSHOT</version>
+ <version>1.16.1</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 375eba8..de08f73 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.1-SNAPSHOT</version>
+ <version>1.16.1</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 d082c0a..6afe0d1 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.1-SNAPSHOT</version>
+ <version>1.16.1</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 5c1e359..6842bbb 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.1-SNAPSHOT</version>
+ <version>1.16.1</version>
</parent>
<artifactId>isis-core-viewer-wicket-applib</artifactId>
diff --git a/core/viewer-wicket-impl/pom.xml b/core/viewer-wicket-impl/pom.xml
index 2136550..aff26d4 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.1-SNAPSHOT</version>
+ <version>1.16.1</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 70d43e4..862cbb7 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.1-SNAPSHOT</version>
+ <version>1.16.1</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 e0b2931..ba782c0 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.1-SNAPSHOT</version>
+ <version>1.16.1</version>
</parent>
<artifactId>isis-core-viewer-wicket-ui</artifactId>
diff --git a/core/webserver/pom.xml b/core/webserver/pom.xml
index 2530ba6..67f27a5 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.1-SNAPSHOT</version>
+ <version>1.16.1</version>
</parent>
<artifactId>isis-core-webserver</artifactId>
diff --git a/core/wrapper/pom.xml b/core/wrapper/pom.xml
index 2901ff5..590ce4f 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.1-SNAPSHOT</version>
+ <version>1.16.1</version>
</parent>
<artifactId>isis-core-wrapper</artifactId>
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.
[isis] 23/31: [maven-release-plugin] prepare for next development
iteration
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch release-1.16.1-RC2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 2d63d8dce66ced37c838e55c8cd28aea1e724a10
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Sun Feb 18 15:39:37 2018 +0000
[maven-release-plugin] prepare for next development iteration
---
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 | 72 ++++++++++++++--------------
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 +-
24 files changed, 61 insertions(+), 61 deletions(-)
diff --git a/core/applib/pom.xml b/core/applib/pom.xml
index 2b3001c..86dbc37 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.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
</parent>
<artifactId>isis-core-applib</artifactId>
diff --git a/core/integtestsupport/pom.xml b/core/integtestsupport/pom.xml
index a1811eb..50e15c1 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.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
</parent>
<artifactId>isis-core-integtestsupport</artifactId>
diff --git a/core/log4j/pom.xml b/core/log4j/pom.xml
index 159c0b5..115312e 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.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
</parent>
<artifactId>isis-core-log4j</artifactId>
diff --git a/core/maven-plugin/pom.xml b/core/maven-plugin/pom.xml
index d8fc83a..3e3646b 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.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
</parent>
<groupId>org.apache.isis.tool</groupId>
diff --git a/core/mavendeps/intellij/pom.xml b/core/mavendeps/intellij/pom.xml
index e33d0d4..7a387b6 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.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/core/mavendeps/testing/pom.xml b/core/mavendeps/testing/pom.xml
index 8d04f5e..6504f20 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.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/core/mavendeps/webapp/pom.xml b/core/mavendeps/webapp/pom.xml
index e3e2cdd..ddeecf4 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.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/core/metamodel/pom.xml b/core/metamodel/pom.xml
index aac030e..697eb3d 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.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
</parent>
<artifactId>isis-core-metamodel</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index 769b51f..a049146 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.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
<packaging>pom</packaging>
@@ -190,7 +190,7 @@
<connection>scm:git:http://github.com/apache/isis.git</connection>
<developerConnection>scm:git:https://github.com/apache/isis.git</developerConnection>
<url>http://github.com/apache/isis</url>
- <tag>isis-1.16.1</tag>
+ <tag>HEAD</tag>
</scm>
<url>http://isis.apache.org</url>
@@ -1141,12 +1141,12 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-unittestsupport</artifactId>
- <version>1.16.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-unittestsupport</artifactId>
- <version>1.16.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1155,14 +1155,14 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-applib</artifactId>
- <version>1.16.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-applib</artifactId>
- <version>1.16.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1171,14 +1171,14 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-schema</artifactId>
- <version>1.16.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-schema</artifactId>
- <version>1.16.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1187,7 +1187,7 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-log4j</artifactId>
- <version>1.16.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
@@ -1196,14 +1196,14 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-metamodel</artifactId>
- <version>1.16.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-metamodel</artifactId>
- <version>1.16.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1212,76 +1212,76 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-runtime</artifactId>
- <version>1.16.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-runtime</artifactId>
- <version>1.16.1</version>
+ <version>2.0.0-M1-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.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
</dependency>
<!-- webserver -->
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-webserver</artifactId>
- <version>1.16.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
</dependency>
<!-- specsupport -->
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-specsupport</artifactId>
- <version>1.16.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
</dependency>
<!-- integtestsupport -->
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-integtestsupport</artifactId>
- <version>1.16.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
</dependency>
<!-- Restful Objects viewer -->
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-applib</artifactId>
- <version>1.16.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-applib</artifactId>
- <version>1.16.1</version>
+ <version>2.0.0-M1-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.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-rendering</artifactId>
- <version>1.16.1</version>
+ <version>2.0.0-M1-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.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-server</artifactId>
- <version>1.16.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1290,12 +1290,12 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-security</artifactId>
- <version>1.16.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-security-shiro</artifactId>
- <version>1.16.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
</dependency>
@@ -1303,41 +1303,41 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-wicket-applib</artifactId>
- <version>1.16.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-wicket-model</artifactId>
- <version>1.16.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-wicket-model</artifactId>
- <version>1.16.1</version>
+ <version>2.0.0-M1-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.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-wicket-ui</artifactId>
- <version>1.16.1</version>
+ <version>2.0.0-M1-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.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-wicket-impl</artifactId>
- <version>1.16.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
@@ -1346,26 +1346,26 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.tool</groupId>
<artifactId>isis-maven-plugin</artifactId>
- <version>1.16.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
</dependency>
<!-- Maven dependencies -->
<dependency>
<groupId>org.apache.isis.mavendeps</groupId>
<artifactId>isis-mavendeps-intellij</artifactId>
- <version>1.16.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.apache.isis.mavendeps</groupId>
<artifactId>isis-mavendeps-testing</artifactId>
- <version>1.16.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.apache.isis.mavendeps</groupId>
<artifactId>isis-mavendeps-webapp</artifactId>
- <version>1.16.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
<type>pom</type>
</dependency>
diff --git a/core/runtime/pom.xml b/core/runtime/pom.xml
index 53a1d5b..0aa0361 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.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
</parent>
<artifactId>isis-core-runtime</artifactId>
diff --git a/core/schema/pom.xml b/core/schema/pom.xml
index 25d01af..73b432f 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.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
</parent>
<artifactId>isis-core-schema</artifactId>
diff --git a/core/security-shiro/pom.xml b/core/security-shiro/pom.xml
index cd643b1..13535bb 100644
--- a/core/security-shiro/pom.xml
+++ b/core/security-shiro/pom.xml
@@ -23,11 +23,11 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.16.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
</parent>
<artifactId>isis-core-security-shiro</artifactId>
- <version>1.16.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
<name>Apache Isis Security Shiro</name>
@@ -70,7 +70,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-security-shiro</artifactId>
- <version>1.16.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
</dependency>
</dependencies>
</dependencyManagement>
diff --git a/core/security/pom.xml b/core/security/pom.xml
index 8094779..03fc5e7 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.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
</parent>
<artifactId>isis-core-security</artifactId>
diff --git a/core/specsupport/pom.xml b/core/specsupport/pom.xml
index f61fd65..6ae7e18 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.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
</parent>
<artifactId>isis-core-specsupport</artifactId>
diff --git a/core/unittestsupport/pom.xml b/core/unittestsupport/pom.xml
index 53f70ea..25ddbfb 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.1</version>
+ <version>2.0.0-M1-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 1a606c6..e3206ae 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.1</version>
+ <version>2.0.0-M1-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 de08f73..7a9feb3 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.1</version>
+ <version>2.0.0-M1-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 6afe0d1..1bae1d0 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.1</version>
+ <version>2.0.0-M1-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 6842bbb..a415304 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.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
</parent>
<artifactId>isis-core-viewer-wicket-applib</artifactId>
diff --git a/core/viewer-wicket-impl/pom.xml b/core/viewer-wicket-impl/pom.xml
index aff26d4..9c11554 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.1</version>
+ <version>2.0.0-M1-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 862cbb7..aa7a091 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.1</version>
+ <version>2.0.0-M1-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 ba782c0..edf4621 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.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
</parent>
<artifactId>isis-core-viewer-wicket-ui</artifactId>
diff --git a/core/webserver/pom.xml b/core/webserver/pom.xml
index 67f27a5..24ec1d8 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.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
</parent>
<artifactId>isis-core-webserver</artifactId>
diff --git a/core/wrapper/pom.xml b/core/wrapper/pom.xml
index 590ce4f..3d2f9a8 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.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
</parent>
<artifactId>isis-core-wrapper</artifactId>
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.
[isis] 21/31: ISIS-1813: hides git-commit-id-plugin behind a
profile, and updates the instructions for verifying releases.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch release-1.16.1-RC2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit c85a24246b09c7fd938f89271474e00f4f047261
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Sun Feb 18 14:20:52 2018 +0000
ISIS-1813: hides git-commit-id-plugin behind a profile, and updates the instructions for verifying releases.
---
.../guides/cgcom/_cgcom_verifying-releases.adoc | 19 +++++++++++--------
core/pom.xml | 21 ++++++++++++++++-----
2 files changed, 27 insertions(+), 13 deletions(-)
diff --git a/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_verifying-releases.adoc b/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_verifying-releases.adoc
index 07da28c..38cac73 100644
--- a/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_verifying-releases.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_verifying-releases.adoc
@@ -83,24 +83,27 @@ gpg --verify isis-x.y.z.zip.asc isis-x.y.z.zip
Assuming the ZIP file verifies, it should be unpacked, and then the artifact built from source.
-To build Apache Isis core, first download any dependencies:
+To build Apache Isis core, first clean out the local repository cache:
[source]
----
-mvn dependency:go-offline
+rm -rf ~/m2/repository/org/apache/isis
----
-Check that no Isis artifacts have yet been downloaded, ie there is no `~/.m2/org/repository/org/apache/isis` directory.
-If there are, it could indicate that the release being verified incorrectly references previous versions of Apache Isis
-
-Assuming all is ok, build using the `-o` offline flag:
+and then build using:
[source]
----
-mvn clean install -o
+mvn clean install -Dskip.git
----
-Confirm that the versions of the Isis artifacts now cached in your local repository are correct.
+[IMPORTANT]
+====
+The `-Dskip.git` is required in order to temporarily disable the `git-commit-id-plugin` (which expects to be run within a git repository).
+====
+
+
+Optionally, confirm that the versions of the Isis artifacts now cached in your local repository are correct.
==== Verifying binary artifacts
diff --git a/core/pom.xml b/core/pom.xml
index f65309e..346864a 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -1060,11 +1060,6 @@
</plugin>
<plugin>
- <groupId>pl.project13.maven</groupId>
- <artifactId>git-commit-id-plugin</artifactId>
- </plugin>
-
- <plugin>
<artifactId>maven-remote-resources-plugin</artifactId>
<executions>
<execution>
@@ -2266,6 +2261,22 @@ ${license.additional-notes}
</plugins>
</build>
</profile>
+ <profile>
+ <id>git</id>
+ <activation>
+ <property>
+ <name>!skip.git</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>pl.project13.maven</groupId>
+ <artifactId>git-commit-id-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
<modules>
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.
[isis] 03/31: [maven-release-plugin] prepare for next development
iteration
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch release-1.16.1-RC2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 831b96417438d4816235099b97aabb4ec65d150f
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Feb 13 23:47:37 2018 +0000
[maven-release-plugin] prepare for next development iteration
---
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 | 72 ++++++++++++++--------------
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 +-
24 files changed, 61 insertions(+), 61 deletions(-)
diff --git a/core/applib/pom.xml b/core/applib/pom.xml
index 2b3001c..86dbc37 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.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
</parent>
<artifactId>isis-core-applib</artifactId>
diff --git a/core/integtestsupport/pom.xml b/core/integtestsupport/pom.xml
index a1811eb..50e15c1 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.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
</parent>
<artifactId>isis-core-integtestsupport</artifactId>
diff --git a/core/log4j/pom.xml b/core/log4j/pom.xml
index 159c0b5..115312e 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.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
</parent>
<artifactId>isis-core-log4j</artifactId>
diff --git a/core/maven-plugin/pom.xml b/core/maven-plugin/pom.xml
index d8fc83a..3e3646b 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.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
</parent>
<groupId>org.apache.isis.tool</groupId>
diff --git a/core/mavendeps/intellij/pom.xml b/core/mavendeps/intellij/pom.xml
index e33d0d4..7a387b6 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.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/core/mavendeps/testing/pom.xml b/core/mavendeps/testing/pom.xml
index 8d04f5e..6504f20 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.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/core/mavendeps/webapp/pom.xml b/core/mavendeps/webapp/pom.xml
index e3e2cdd..ddeecf4 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.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/core/metamodel/pom.xml b/core/metamodel/pom.xml
index aac030e..697eb3d 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.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
</parent>
<artifactId>isis-core-metamodel</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index 0e8e8cc..2606976 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.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
<packaging>pom</packaging>
@@ -190,7 +190,7 @@
<connection>scm:git:http://github.com/apache/isis.git</connection>
<developerConnection>scm:git:https://github.com/apache/isis.git</developerConnection>
<url>http://github.com/apache/isis</url>
- <tag>isis-1.16.1</tag>
+ <tag>HEAD</tag>
</scm>
<url>http://isis.apache.org</url>
@@ -1146,12 +1146,12 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-unittestsupport</artifactId>
- <version>1.16.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-unittestsupport</artifactId>
- <version>1.16.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1160,14 +1160,14 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-applib</artifactId>
- <version>1.16.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-applib</artifactId>
- <version>1.16.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1176,14 +1176,14 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-schema</artifactId>
- <version>1.16.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-schema</artifactId>
- <version>1.16.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1192,7 +1192,7 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-log4j</artifactId>
- <version>1.16.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
@@ -1201,14 +1201,14 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-metamodel</artifactId>
- <version>1.16.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-metamodel</artifactId>
- <version>1.16.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1217,76 +1217,76 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-runtime</artifactId>
- <version>1.16.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-runtime</artifactId>
- <version>1.16.1</version>
+ <version>2.0.0-M1-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.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
</dependency>
<!-- webserver -->
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-webserver</artifactId>
- <version>1.16.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
</dependency>
<!-- specsupport -->
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-specsupport</artifactId>
- <version>1.16.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
</dependency>
<!-- integtestsupport -->
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-integtestsupport</artifactId>
- <version>1.16.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
</dependency>
<!-- Restful Objects viewer -->
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-applib</artifactId>
- <version>1.16.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-applib</artifactId>
- <version>1.16.1</version>
+ <version>2.0.0-M1-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.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-rendering</artifactId>
- <version>1.16.1</version>
+ <version>2.0.0-M1-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.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-server</artifactId>
- <version>1.16.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1295,12 +1295,12 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-security</artifactId>
- <version>1.16.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-security-shiro</artifactId>
- <version>1.16.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
</dependency>
@@ -1308,41 +1308,41 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-wicket-applib</artifactId>
- <version>1.16.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-wicket-model</artifactId>
- <version>1.16.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-wicket-model</artifactId>
- <version>1.16.1</version>
+ <version>2.0.0-M1-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.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-wicket-ui</artifactId>
- <version>1.16.1</version>
+ <version>2.0.0-M1-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.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-wicket-impl</artifactId>
- <version>1.16.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
@@ -1351,26 +1351,26 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.tool</groupId>
<artifactId>isis-maven-plugin</artifactId>
- <version>1.16.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
</dependency>
<!-- Maven dependencies -->
<dependency>
<groupId>org.apache.isis.mavendeps</groupId>
<artifactId>isis-mavendeps-intellij</artifactId>
- <version>1.16.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.apache.isis.mavendeps</groupId>
<artifactId>isis-mavendeps-testing</artifactId>
- <version>1.16.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.apache.isis.mavendeps</groupId>
<artifactId>isis-mavendeps-webapp</artifactId>
- <version>1.16.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
<type>pom</type>
</dependency>
diff --git a/core/runtime/pom.xml b/core/runtime/pom.xml
index 53a1d5b..0aa0361 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.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
</parent>
<artifactId>isis-core-runtime</artifactId>
diff --git a/core/schema/pom.xml b/core/schema/pom.xml
index 25d01af..73b432f 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.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
</parent>
<artifactId>isis-core-schema</artifactId>
diff --git a/core/security-shiro/pom.xml b/core/security-shiro/pom.xml
index cd643b1..13535bb 100644
--- a/core/security-shiro/pom.xml
+++ b/core/security-shiro/pom.xml
@@ -23,11 +23,11 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.16.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
</parent>
<artifactId>isis-core-security-shiro</artifactId>
- <version>1.16.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
<name>Apache Isis Security Shiro</name>
@@ -70,7 +70,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-security-shiro</artifactId>
- <version>1.16.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
</dependency>
</dependencies>
</dependencyManagement>
diff --git a/core/security/pom.xml b/core/security/pom.xml
index 8094779..03fc5e7 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.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
</parent>
<artifactId>isis-core-security</artifactId>
diff --git a/core/specsupport/pom.xml b/core/specsupport/pom.xml
index f61fd65..6ae7e18 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.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
</parent>
<artifactId>isis-core-specsupport</artifactId>
diff --git a/core/unittestsupport/pom.xml b/core/unittestsupport/pom.xml
index 53f70ea..25ddbfb 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.1</version>
+ <version>2.0.0-M1-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 1a606c6..e3206ae 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.1</version>
+ <version>2.0.0-M1-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 de08f73..7a9feb3 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.1</version>
+ <version>2.0.0-M1-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 6afe0d1..1bae1d0 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.1</version>
+ <version>2.0.0-M1-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 6842bbb..a415304 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.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
</parent>
<artifactId>isis-core-viewer-wicket-applib</artifactId>
diff --git a/core/viewer-wicket-impl/pom.xml b/core/viewer-wicket-impl/pom.xml
index aff26d4..9c11554 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.1</version>
+ <version>2.0.0-M1-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 862cbb7..aa7a091 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.1</version>
+ <version>2.0.0-M1-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 ba782c0..edf4621 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.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
</parent>
<artifactId>isis-core-viewer-wicket-ui</artifactId>
diff --git a/core/webserver/pom.xml b/core/webserver/pom.xml
index 67f27a5..24ec1d8 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.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
</parent>
<artifactId>isis-core-webserver</artifactId>
diff --git a/core/wrapper/pom.xml b/core/wrapper/pom.xml
index 590ce4f..3d2f9a8 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.1</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
</parent>
<artifactId>isis-core-wrapper</artifactId>
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.
[isis] 07/31: ISIS-1813: recreating helloworld archetype
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch release-1.16.1-RC2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit ad8d4305e1793b7a1333eb71b610411cf4ffa221
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Feb 14 09:55:24 2018 +0000
ISIS-1813: recreating helloworld archetype
---
example/archetype/helloworld/pom.xml | 9 ++++-----
.../helloworld/src/main/resources/archetype-resources/pom.xml | 3 ++-
.../src/main/java/domainapp/dom/impl/HelloWorldObject.java | 1 +
.../src/test/resources/projects/basic/archetype.properties | 2 +-
4 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/example/archetype/helloworld/pom.xml b/example/archetype/helloworld/pom.xml
index 7fab804..dbf6eed 100644
--- a/example/archetype/helloworld/pom.xml
+++ b/example/archetype/helloworld/pom.xml
@@ -17,11 +17,11 @@
specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.isis.archetype</groupId>
<artifactId>helloworld-archetype</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>1.16.1-SNAPSHOT</version>
<packaging>maven-archetype</packaging>
<name>helloworld-archetype</name>
<build>
@@ -65,12 +65,11 @@
<connection>scm:git:git@github.com:incodehq/incode-build.git/helloworld</connection>
<developerConnection>scm:git:git@github.com:incodehq/incode-build.git/helloworld</developerConnection>
<url>git@github.com:incodehq/incode-build.git/helloworld</url>
- <tag>HEAD</tag>
- </scm>
+ </scm>
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1</version>
<relativePath>../../../core/pom.xml</relativePath>
</parent>
<properties>
diff --git a/example/archetype/helloworld/src/main/resources/archetype-resources/pom.xml b/example/archetype/helloworld/src/main/resources/archetype-resources/pom.xml
index d1a1371..790920c 100644
--- a/example/archetype/helloworld/src/main/resources/archetype-resources/pom.xml
+++ b/example/archetype/helloworld/src/main/resources/archetype-resources/pom.xml
@@ -34,10 +34,11 @@
<packaging>war</packaging>
<properties>
- <isis.version>1.16.0</isis.version>
+ <isis.version>1.16.1</isis.version>
<compiler-plugin.source>1.8</compiler-plugin.source>
<compiler-plugin.target>1.8</compiler-plugin.target>
+ <compiler-plugin.compilerArgument>-parameters</compiler-plugin.compilerArgument>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
diff --git a/example/archetype/helloworld/src/main/resources/archetype-resources/src/main/java/domainapp/dom/impl/HelloWorldObject.java b/example/archetype/helloworld/src/main/resources/archetype-resources/src/main/java/domainapp/dom/impl/HelloWorldObject.java
index 6217c1f..164705b 100644
--- a/example/archetype/helloworld/src/main/resources/archetype-resources/src/main/java/domainapp/dom/impl/HelloWorldObject.java
+++ b/example/archetype/helloworld/src/main/resources/archetype-resources/src/main/java/domainapp/dom/impl/HelloWorldObject.java
@@ -114,4 +114,5 @@ public class HelloWorldObject implements Comparable<HelloWorldObject> {
@javax.inject.Inject
MessageService messageService;
+
}
\ No newline at end of file
diff --git a/example/archetype/helloworld/src/test/resources/projects/basic/archetype.properties b/example/archetype/helloworld/src/test/resources/projects/basic/archetype.properties
index 1d3452a..756a23f 100644
--- a/example/archetype/helloworld/src/test/resources/projects/basic/archetype.properties
+++ b/example/archetype/helloworld/src/test/resources/projects/basic/archetype.properties
@@ -1,4 +1,4 @@
-#Thu Jan 04 19:13:48 GMT 2018
+#Wed Feb 14 09:55:12 GMT 2018
package=it.pkg
version=0.1-SNAPSHOT
groupId=archetype.it
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.
[isis] 04/31: ISIS-1813: recreating simpleapp archetype
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch release-1.16.1-RC2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 4c39bdb4d6c3964e3cca2f266c51892a58afa18e
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Feb 14 09:30:58 2018 +0000
ISIS-1813: recreating simpleapp archetype
---
example/archetype/simpleapp/pom.xml | 9 ++++-----
.../src/main/resources/archetype-resources/README.adoc | 2 +-
.../application/bdd/specglue/BootstrappingGlue.java | 16 ++++++++++++++--
.../specs/{RunBddSpecs.java => RunIntegBddSpecs.java} | 2 +-
.../domainapp/modules/simple/dom/impl/SimpleObject.java | 3 ++-
.../modules/simple/dom/impl/SimpleObject.layout.xml | 6 +-----
.../src/main/resources/archetype-resources/pom.xml | 3 ++-
.../test/resources/projects/basic/archetype.properties | 2 +-
8 files changed, 26 insertions(+), 17 deletions(-)
diff --git a/example/archetype/simpleapp/pom.xml b/example/archetype/simpleapp/pom.xml
index d6c8865..8a26db9 100644
--- a/example/archetype/simpleapp/pom.xml
+++ b/example/archetype/simpleapp/pom.xml
@@ -17,11 +17,11 @@
specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.isis.archetype</groupId>
<artifactId>simpleapp-archetype</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>1.16.1-SNAPSHOT</version>
<packaging>maven-archetype</packaging>
<name>simpleapp-archetype</name>
<build>
@@ -65,12 +65,11 @@
<connection>scm:git:git@github.com:incodehq/incode-build.git/simpleapp</connection>
<developerConnection>scm:git:git@github.com:incodehq/incode-build.git/simpleapp</developerConnection>
<url>git@github.com:incodehq/incode-build.git/simpleapp</url>
- <tag>HEAD</tag>
- </scm>
+ </scm>
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.16.1-SNAPSHOT</version>
+ <version>1.16.1</version>
<relativePath>../../../core/pom.xml</relativePath>
</parent>
<properties>
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/README.adoc b/example/archetype/simpleapp/src/main/resources/archetype-resources/README.adoc
index d52423d..6b62aab 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/README.adoc
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/README.adoc
@@ -70,7 +70,7 @@ Extend/adapt these according to your own standards.
+
[source,bash]
----
-mvn -f pom-jdo-enhance-all.xml datanucleus:enhance
+mvn -pl module-simple datanucleus:enhance -o
----
* To also generate the link:https://github.com/eirbjo/jetty-console[Jetty console], allowing the application to run as a standalone JAR: +
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/application/src/test/java/domainapp/application/bdd/specglue/BootstrappingGlue.java b/example/archetype/simpleapp/src/main/resources/archetype-resources/application/src/test/java/domainapp/application/bdd/specglue/BootstrappingGlue.java
index 608334b..5b2364d 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/application/src/test/java/domainapp/application/bdd/specglue/BootstrappingGlue.java
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/application/src/test/java/domainapp/application/bdd/specglue/BootstrappingGlue.java
@@ -19,11 +19,23 @@ O * Licensed to the Apache Software Foundation (ASF) under one or more
*/
package domainapp.application.bdd.specglue;
-import org.apache.isis.core.specsupport.specs.CukeGlueBootstrappingAbstract;
+import org.apache.isis.core.runtime.headless.HeadlessWithBootstrappingAbstract;
+import cucumber.api.java.After;
+import cucumber.api.java.Before;
import domainapp.application.DomainAppApplicationModule;
-public class BootstrappingGlue extends CukeGlueBootstrappingAbstract {
+public class BootstrappingGlue extends HeadlessWithBootstrappingAbstract {
+
+ @Before(order=100)
+ public void beforeScenario() {
+ super.bootstrapAndSetupIfRequired();
+ }
+
+ @After
+ public void afterScenario(cucumber.api.Scenario sc) {
+ super.tearDownAllModules();
+ }
public BootstrappingGlue() {
super(new DomainAppApplicationModule());
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/application/src/test/java/domainapp/application/bdd/specs/RunBddSpecs.java b/example/archetype/simpleapp/src/main/resources/archetype-resources/application/src/test/java/domainapp/application/bdd/specs/RunIntegBddSpecs.java
similarity index 97%
rename from example/archetype/simpleapp/src/main/resources/archetype-resources/application/src/test/java/domainapp/application/bdd/specs/RunBddSpecs.java
rename to example/archetype/simpleapp/src/main/resources/archetype-resources/application/src/test/java/domainapp/application/bdd/specs/RunIntegBddSpecs.java
index bfa9c24..2ede811 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/application/src/test/java/domainapp/application/bdd/specs/RunBddSpecs.java
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/application/src/test/java/domainapp/application/bdd/specs/RunIntegBddSpecs.java
@@ -41,6 +41,6 @@ import cucumber.api.junit.Cucumber;
strict = true,
tags = { "~@backlog", "~@ignore" }
)
-public class RunBddSpecs {
+public class RunIntegBddSpecs {
// intentionally empty
}
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObject.java b/example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObject.java
index 3a7322b..8e7a2c3 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObject.java
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObject.java
@@ -27,6 +27,7 @@ import javax.jdo.annotations.VersionStrategy;
import com.google.common.collect.ComparisonChain;
import org.apache.isis.applib.annotation.Action;
+import org.apache.isis.applib.annotation.ActionLayout;
import org.apache.isis.applib.annotation.Auditing;
import org.apache.isis.applib.annotation.CommandReification;
import org.apache.isis.applib.annotation.DomainObject;
@@ -66,7 +67,7 @@ public class SimpleObject implements Comparable<SimpleObject> {
private String notes;
- @Action(semantics = SemanticsOf.IDEMPOTENT, command = CommandReification.ENABLED, publishing = Publishing.ENABLED)
+ @Action(semantics = SemanticsOf.IDEMPOTENT, command = CommandReification.ENABLED, publishing = Publishing.ENABLED, associateWith = "name")
public SimpleObject updateName(
@Parameter(maxLength = 40)
@ParameterLayout(named = "Name")
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObject.layout.xml b/example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObject.layout.xml
index e45515f..c27d88d 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObject.layout.xml
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObject.layout.xml
@@ -37,11 +37,7 @@
<c:action id="delete">
<c:describedAs>Deletes this object from the persistent datastore</c:describedAs>
</c:action>
- <c:property id="name" namedEscaped="true">
- <c:action id="updateName">
- <c:describedAs>Updates the object's name</c:describedAs>
- </c:action>
- </c:property>
+ <c:property id="name" namedEscaped="true"/>
<c:property id="notes" namedEscaped="true" multiLine="10" hidden="ALL_TABLES"/>
</c:fieldSet>
</bs3:col>
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml b/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml
index 2e0b0d2..ead8212 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml
@@ -34,12 +34,13 @@
<packaging>pom</packaging>
<properties>
- <isis.version>1.16.0</isis.version>
+ <isis.version>1.16.1</isis.version>
<lombok.version>1.16.18</lombok.version>
<compiler-plugin.source>1.8</compiler-plugin.source>
<compiler-plugin.target>1.8</compiler-plugin.target>
+ <compiler-plugin.compilerArgument>-parameters</compiler-plugin.compilerArgument>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
diff --git a/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties b/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties
index 4965284..83ad706 100644
--- a/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties
+++ b/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties
@@ -1,4 +1,4 @@
-#Thu Jan 04 18:50:01 GMT 2018
+#Wed Feb 14 09:30:44 GMT 2018
package=it.pkg
version=0.1-SNAPSHOT
groupId=archetype.it
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.
[isis] 30/31: [maven-release-plugin] prepare release
helloworld-archetype-1.16.1
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch release-1.16.1-RC2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit b7aefecab4591b1d51f0fd8afe7856dbc95496db
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Sun Feb 18 16:27:08 2018 +0000
[maven-release-plugin] prepare release helloworld-archetype-1.16.1
---
example/archetype/helloworld/pom.xml | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/example/archetype/helloworld/pom.xml b/example/archetype/helloworld/pom.xml
index dbf6eed..9ffb224 100644
--- a/example/archetype/helloworld/pom.xml
+++ b/example/archetype/helloworld/pom.xml
@@ -17,11 +17,11 @@
specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.isis.archetype</groupId>
<artifactId>helloworld-archetype</artifactId>
- <version>1.16.1-SNAPSHOT</version>
+ <version>1.16.1</version>
<packaging>maven-archetype</packaging>
<name>helloworld-archetype</name>
<build>
@@ -65,7 +65,8 @@
<connection>scm:git:git@github.com:incodehq/incode-build.git/helloworld</connection>
<developerConnection>scm:git:git@github.com:incodehq/incode-build.git/helloworld</developerConnection>
<url>git@github.com:incodehq/incode-build.git/helloworld</url>
- </scm>
+ <tag>helloworld-archetype-1.16.1</tag>
+ </scm>
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.
[isis] 25/31: ISIS-1813: recreating simpleapp archetype
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch release-1.16.1-RC2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit f19d29f1039d092383307d85ad0eb40e607664bb
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Sun Feb 18 16:17:56 2018 +0000
ISIS-1813: recreating simpleapp archetype
---
example/archetype/simpleapp/pom.xml | 7 +++----
.../src/test/resources/projects/basic/archetype.properties | 2 +-
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/example/archetype/simpleapp/pom.xml b/example/archetype/simpleapp/pom.xml
index 0b4e890..8a26db9 100644
--- a/example/archetype/simpleapp/pom.xml
+++ b/example/archetype/simpleapp/pom.xml
@@ -17,7 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.isis.archetype</groupId>
<artifactId>simpleapp-archetype</artifactId>
@@ -65,12 +65,11 @@
<connection>scm:git:git@github.com:incodehq/incode-build.git/simpleapp</connection>
<developerConnection>scm:git:git@github.com:incodehq/incode-build.git/simpleapp</developerConnection>
<url>git@github.com:incodehq/incode-build.git/simpleapp</url>
- <tag>HEAD</tag>
- </scm>
+ </scm>
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.16.1-SNAPSHOT</version>
+ <version>1.16.1</version>
<relativePath>../../../core/pom.xml</relativePath>
</parent>
<properties>
diff --git a/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties b/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties
index 83ad706..9290491 100644
--- a/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties
+++ b/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties
@@ -1,4 +1,4 @@
-#Wed Feb 14 09:30:44 GMT 2018
+#Sun Feb 18 16:17:45 GMT 2018
package=it.pkg
version=0.1-SNAPSHOT
groupId=archetype.it
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.
[isis] 05/31: [maven-release-plugin] prepare release
simpleapp-archetype-1.16.1
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch release-1.16.1-RC2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 1d52c267953192e49f8f80c29b6bd23d480461c9
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Feb 14 09:32:29 2018 +0000
[maven-release-plugin] prepare release simpleapp-archetype-1.16.1
---
example/archetype/simpleapp/pom.xml | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/example/archetype/simpleapp/pom.xml b/example/archetype/simpleapp/pom.xml
index 8a26db9..777dde2 100644
--- a/example/archetype/simpleapp/pom.xml
+++ b/example/archetype/simpleapp/pom.xml
@@ -17,11 +17,11 @@
specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.isis.archetype</groupId>
<artifactId>simpleapp-archetype</artifactId>
- <version>1.16.1-SNAPSHOT</version>
+ <version>1.16.1</version>
<packaging>maven-archetype</packaging>
<name>simpleapp-archetype</name>
<build>
@@ -65,7 +65,8 @@
<connection>scm:git:git@github.com:incodehq/incode-build.git/simpleapp</connection>
<developerConnection>scm:git:git@github.com:incodehq/incode-build.git/simpleapp</developerConnection>
<url>git@github.com:incodehq/incode-build.git/simpleapp</url>
- </scm>
+ <tag>simpleapp-archetype-1.16.1</tag>
+ </scm>
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.
[isis] 15/31: ISIS-1813: reverts isis.version to -SNAPSHOT for apps
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch release-1.16.1-RC2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit f373b64a5de4444062635a7eae2c83a913686454
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Sun Feb 18 10:23:56 2018 +0000
ISIS-1813: reverts isis.version to -SNAPSHOT for apps
---
example/application/helloworld/pom.xml | 2 +-
example/application/simpleapp/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/example/application/helloworld/pom.xml b/example/application/helloworld/pom.xml
index efa8848..bb2cef0 100644
--- a/example/application/helloworld/pom.xml
+++ b/example/application/helloworld/pom.xml
@@ -36,7 +36,7 @@
<packaging>war</packaging>
<properties>
- <isis.version>1.16.1</isis.version>
+ <isis.version>1.16.1-SNAPSHOT</isis.version>
<compiler-plugin.source>1.8</compiler-plugin.source>
<compiler-plugin.target>1.8</compiler-plugin.target>
diff --git a/example/application/simpleapp/pom.xml b/example/application/simpleapp/pom.xml
index 35127f6..8525106 100644
--- a/example/application/simpleapp/pom.xml
+++ b/example/application/simpleapp/pom.xml
@@ -36,7 +36,7 @@
<packaging>pom</packaging>
<properties>
- <isis.version>1.16.1</isis.version>
+ <isis.version>1.16.1-SNAPSHOT</isis.version>
<lombok.version>1.16.18</lombok.version>
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.
[isis] 12/31: Merge branch 'maint-1.16.1' into release-1.16.1-RC1
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch release-1.16.1-RC2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit eef5aaa4ac34d7393f438468462c26a86705dffa
Merge: 403c85a 392d475
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Feb 14 10:36:13 2018 +0000
Merge branch 'maint-1.16.1' into release-1.16.1-RC1
.../guides/rgant/_rgant-Action_command.adoc | 291 ++++++++++++++++-----
.../guides/rgant/_rgant-Property_command.adoc | 218 ++++++++++-----
.../guides/ugodn/_ugodn_hints-and-tips.adoc | 1 +
..._ugodn_hints-and-tips_jdoql-and-timestamps.adoc | 76 ++++++
4 files changed, 454 insertions(+), 132 deletions(-)
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.