[isis] branch master updated: ISIS-1841 further preparing for jdk 10+ build

[ahuber]

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

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


The following commit(s) were added to refs/heads/master by this push:
 new 84a55cf  ISIS-1841 further preparing for jdk 10+ build
84a55cf is described below

commit 84a55cf0e152f304a807bfc125c44a529cab910c
Author: Andi Huber 
AuthorDate: Tue May 22 15:42:21 2018 +0200

ISIS-1841 further preparing for jdk 10+ build
---
 core/maven-plugin/pom.xml | 20 
 core/pom.xml  | 25 +
 2 files changed, 17 insertions(+), 28 deletions(-)

diff --git a/core/maven-plugin/pom.xml b/core/maven-plugin/pom.xml
index 5620e29..c16385a 100644
--- a/core/maven-plugin/pom.xml
+++ b/core/maven-plugin/pom.xml
@@ -37,17 +37,19 @@
 
 
 
-3.0.4
+3.5.3
 
 
 
 
org.apache.isis.tool.mavenplugin
 
org/apache/isis/tool/mavenplugin
 
-3.3.9
+3.5.3
 3.0-alpha-2
-
3.4
-
1.7
+
3.5.1
+
1.7.1
+3.1.0
+
 
 
 
@@ -120,6 +122,12 @@
 
 It's all a bit of a pig's ear...
 -->
+
+
+   org.codehaus.plexus
+plexus-utils
+${plexus-utils.version}
+
 
 
 org.apache.maven
@@ -130,6 +138,10 @@
 org.codehaus.plexus
 plexus-component-annotations
 
+
+   org.codehaus.plexus
+   plexus-utils
+
 
 
 
diff --git a/core/pom.xml b/core/pom.xml
index e432086..3fcd4a3 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -172,11 +172,6 @@
 
 7.0
 
-   
-
 2.1
 
 4.12
@@ -602,7 +597,7 @@
 
 org.apache.maven.plugins
 maven-compiler-plugin
-3.1
+3.7.0
 
 false
 false
@@ -1674,24 +1669,6 @@ ${license.additional-notes}
 ${javassist.version}
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 
 
 com.fasterxml.jackson.core

-- 
To stop receiving notification emails like this one, please contact
ahu...@apache.org.

[isis] branch master updated: ISIS-1841 reorg dependencies such that 'commons' is the root of all

[ahuber]

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

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


The following commit(s) were added to refs/heads/master by this push:
 new 8d959e7  ISIS-1841 reorg dependencies such that 'commons' is the root 
of all
8d959e7 is described below

commit 8d959e731d87ab3ca6b888f052b96a05072c9f21
Author: Andi Huber 
AuthorDate: Tue May 22 14:04:57 2018 +0200

ISIS-1841 reorg dependencies such that 'commons' is the root of all

provides compile dependency of JEE API for 'schema' and
'unittestsupport' which is now required for builds on jdk 10+, because
java.xml.bind and java.xml.ws do no longer live in the jdk
---
 core/applib/pom.xml  | 91 +++-
 core/commons/pom.xml |  6 
 core/schema/pom.xml  |  6 
 3 files changed, 52 insertions(+), 51 deletions(-)

diff --git a/core/applib/pom.xml b/core/applib/pom.xml
index 84481d7..db3d15c 100644
--- a/core/applib/pom.xml
+++ b/core/applib/pom.xml
@@ -56,60 +56,55 @@
 
 
 
-
-
-
-
-org.eclipse.m2e
-lifecycle-mapping
-1.0.0
-
-
-
-
-
-
-org.datanucleus
-
-
-datanucleus-maven-plugin
-
-
-[4.0.0-release,)
-
-
-enhance
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
 
-
+   
 org.apache.isis.core
-isis-core-schema
+isis-core-commons
 
-
+
 
 org.apache.isis.core
-isis-core-commons
+isis-core-schema
 
-
-   
-   
-   javax
-   javaee-api
-   


 
@@ -144,12 +139,6 @@

 
 
-
-   
-
-   com.google.code.findbugs
-   annotations
-
 
 
 
diff --git a/core/commons/pom.xml b/core/commons/pom.xml
index 12d1e38..9e69a91 100644
--- a/core/commons/pom.xml
+++ b/core/commons/pom.xml
@@ -58,6 +58,12 @@
 
 
 
+
+   
+
+   javax
+   javaee-api
+   
 

 
diff --git a/core/schema/pom.xml b/core/schema/pom.xml
index 59f14ee..cdeccdc 100644
--- a/core/schema/pom.xml
+++ b/core/schema/pom.xml
@@ -40,6 +40,12 @@
 
 
 
+
+   
+org.apache.isis.core
+isis-core-commons
+
+
 
 joda-time
 joda-time

-- 
To stop receiving notification emails like this one, please contact
ahu...@apache.org.

[isis] branch master updated: ISIS-1841 Internal API: polishing _With

[ahuber]

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

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


The following commit(s) were added to refs/heads/master by this push:
 new 1bdf869  ISIS-1841 Internal API: polishing _With
1bdf869 is described below

commit 1bdf869f24c6c93db5846489e7936d5e0a909307
Author: Andi Huber 
AuthorDate: Tue May 22 11:04:44 2018 +0200

ISIS-1841 Internal API: polishing _With
---
 .../main/java/org/apache/isis/commons/internal/base/_With.java   | 9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git 
a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_With.java 
b/core/commons/src/main/java/org/apache/isis/commons/internal/base/_With.java
index c128a54..2e67d45 100644
--- 
a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_With.java
+++ 
b/core/commons/src/main/java/org/apache/isis/commons/internal/base/_With.java
@@ -124,33 +124,36 @@ public final class _With {
// -- MAPPING IDIOMS

/**
+* Equivalent to {@code 
Optional.ofNullable(obj).map(mapper).orElse(orElse);}
 * @param obj (nullable)
 * @param mapper
 * @param orElse (nullable)
 * @return {@code obj!=null ? mapper.apply(obj) : orElse}
 */
-   public static  R mapIfPresent(@Nullable X obj, Function 
mapper, @Nullable R orElse) {
+   public static  R mapIfPresentElse(@Nullable X obj, Function 
mapper, @Nullable R orElse) {
return obj!=null ? requires(mapper, "mapper").apply(obj) : 
orElse;  
}

/**
+* Equivalent to {@code 
Optional.ofNullable(obj).map(mapper).orElseGet(elseGet);} 
 * @param obj (nullable)
 * @param mapper
 * @param elseGet
 * @return {@code obj!=null ? mapper.apply(obj) : elseGet.get()}
 */
-   public static  R mapIfPresent(@Nullable X obj, Function 
mapper, Supplier elseGet) {
+   public static  R mapIfPresentElseGet(@Nullable X obj, Function mapper, Supplier elseGet) {
return obj!=null ? requires(mapper, "mapper").apply(obj) : 
requires(elseGet, "elseGet").get();
}

/**
+* Equivalent to {@code 
Optional.ofNullable(obj).map(mapper).orElseThrow(elseThrow);}
 * @param obj (nullable)
 * @param mapper
 * @param elseThrow
 * @return {@code obj!=null ? mapper.apply(obj) : throw( 
elseThrow.get() )}
 * @throws E
 */
-   public static  R applyIfPresentElseThrow(
+   public static  R mapIfPresentElseThrow(
@Nullable X obj, 
Function mapper, 
Supplier elseThrow) 

-- 
To stop receiving notification emails like this one, please contact
ahu...@apache.org.

[isis] branch master updated: ISIS-1841 Internal API: introduces _With ...

[ahuber]

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

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


The following commit(s) were added to refs/heads/master by this push:
 new fbf71fb  ISIS-1841 Internal API: introduces _With ...
fbf71fb is described below

commit fbf71fb976aebb24873e781a8e3088388869189f
Author: Andi Huber 
AuthorDate: Tue May 22 10:48:15 2018 +0200

ISIS-1841 Internal API: introduces _With ...

Provides fluent replacements for common accept/apply/supply idioms.
---
 .../isis/commons/internal/base/_NullSafe.java  |  23 +--
 .../apache/isis/commons/internal/base/_With.java   | 201 +
 .../core/metamodel/facets/CollectionUtils.java |   7 +-
 3 files changed, 208 insertions(+), 23 deletions(-)

diff --git 
a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_NullSafe.java
 
b/core/commons/src/main/java/org/apache/isis/commons/internal/base/_NullSafe.java
index 3bd6c63..634897a 100644
--- 
a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_NullSafe.java
+++ 
b/core/commons/src/main/java/org/apache/isis/commons/internal/base/_NullSafe.java
@@ -23,7 +23,6 @@ import java.util.Comparator;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Objects;
-import java.util.function.Consumer;
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
 
@@ -99,7 +98,8 @@ public final class _NullSafe {
// -- ABSENCE/PRESENCE PREDICATES

/**
-* Allows to replace a lambda expression {@code x->x!=null} with {@code 
NullSafe::isPresent}
+* Allows to replace a lambda expression {@code x->x!=null} with {@code 
NullSafe::isPresent}.
+* Equivalent to {@link java.util.Objects#nonNull(Object)}.
 * @param x
 * @return whether {@code x} is not null (present).
 */
@@ -108,7 +108,8 @@ public final class _NullSafe {
}
 
/**
-* Allows to replace a lambda expression {@code x->x==null} with {@code 
NullSafe::isAbsent}
+* Allows to replace a lambda expression {@code x->x==null} with {@code 
NullSafe::isAbsent}.
+* Equivalent to {@link java.util.Objects#isNull(Object)}.
 * @param x
 * @return whether {@code x} is null (absent).
 */
@@ -116,21 +117,6 @@ public final class _NullSafe {
return x==null;
}

-   // -- PEEK OPERATOR
-   
-   /**
-* Unary identity operator that passes {@code obj} to {@code ifPresent} 
if {@code obj} is present.   
-* @param obj
-* @param ifPresent
-* @return {@code obj}
-*/
-   public final static  T peek(T obj, Consumer ifPresent) {
-   if(obj!=null) {
-   ifPresent.accept(obj);
-   }
-   return obj;
-   }
-   
// -- EQUALS/COMPARE

/**
@@ -162,7 +148,6 @@ public final class _NullSafe {

}

-   
// -- EMTPY CHECKS

public static boolean isEmpty(String x) { return x==null || x.length() 
== 0; }
diff --git 
a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_With.java 
b/core/commons/src/main/java/org/apache/isis/commons/internal/base/_With.java
new file mode 100644
index 000..c128a54
--- /dev/null
+++ 
b/core/commons/src/main/java/org/apache/isis/commons/internal/base/_With.java
@@ -0,0 +1,201 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.isis.commons.internal.base;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.TreeMap;
+import java.util.TreeSet;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.function.Supplier;
+
+import javax.annotation.Nullable;
+
+/**
+ * - internal use only -
+ * 
+ * Provides fluent replacements for common accept/apply/supply idioms.
+ * 
+ * 
+ * WARNING: Do NOT use any of the classes provided by this 
package!  
+ * These may be changed or removed without notice!
+ * 
+ * 
+ *