This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch dev/2.0.0-M2
in repository https://gitbox.apache.org/repos/asf/isis.git.
from a142e53 Merge branch 'ISIS-1767-jee-7' into dev/2.0.0-M2
new f82a68a ISIS-1767: fixes dependency convergence issue with com.sun.mail
new 75a0edf ISIS-1744: updates to DN 5.1.5
new de391ed Merge branch 'ISIS-1744-update-to-dn-515' into dev/2.0.0-M2
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
core/pom.xml | 6 +++---
core/runtime/pom.xml | 6 ++++++
example/application/helloworld/pom.xml | 2 +-
example/application/simpleapp/pom.xml | 2 +-
4 files changed, 11 insertions(+), 5 deletions(-)
--
To stop receiving notification emails like this one, please contact
['"commits@isis.apache.org" <co...@isis.apache.org>'].
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch dev/2.0.0-M2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit de391eda20827794eee4e0e127c6601ae8260c40
Merge: a142e53 75a0edf
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 5 14:47:46 2018 +0000
Merge branch 'ISIS-1744-update-to-dn-515' into dev/2.0.0-M2
core/pom.xml | 6 +++---
core/runtime/pom.xml | 6 ++++++
example/application/helloworld/pom.xml | 2 +-
example/application/simpleapp/pom.xml | 2 +-
4 files changed, 11 insertions(+), 5 deletions(-)
--
To stop receiving notification emails like this one, please contact
"commits@isis.apache.org" <co...@isis.apache.org>.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch dev/2.0.0-M2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 75a0edf2831c997c5681e1691892d9c45b81dd9d
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 5 14:46:25 2018 +0000
ISIS-1744: updates to DN 5.1.5
---
core/pom.xml | 6 +++---
example/application/helloworld/pom.xml | 2 +-
example/application/simpleapp/pom.xml | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index 737f95c..cda9a40 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -86,10 +86,10 @@
<!-- Datanucleus Objectstore -->
<jdo-api.version>3.2.0-m7</jdo-api.version>
- <datanucleus-core.version>5.1.5-SNAPSHOT</datanucleus-core.version>
- <datanucleus-api-jdo.version>5.1.5-SNAPSHOT</datanucleus-api-jdo.version>
+ <datanucleus-core.version>5.1.5</datanucleus-core.version>
+ <datanucleus-api-jdo.version>5.1.4</datanucleus-api-jdo.version>
<datanucleus-jdo-query.version>5.0.2</datanucleus-jdo-query.version>
- <datanucleus-rdbms.version>5.1.5-SNAPSHOT</datanucleus-rdbms.version>
+ <datanucleus-rdbms.version>5.1.5</datanucleus-rdbms.version>
<datanucleus-jodatime.version>5.1.0-release</datanucleus-jodatime.version>
<!--
ISIS-1288: seen integration tests to fail;
diff --git a/example/application/helloworld/pom.xml b/example/application/helloworld/pom.xml
index aee7956..dab1b17 100644
--- a/example/application/helloworld/pom.xml
+++ b/example/application/helloworld/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.incode</groupId>
<artifactId>incode-build</artifactId>
- <version>3-SNAPSHOT</version>
+ <version>4</version>
</parent>
<groupId>org.apache.isis.example.application</groupId>
diff --git a/example/application/simpleapp/pom.xml b/example/application/simpleapp/pom.xml
index eb423d2..54b7a1e 100644
--- a/example/application/simpleapp/pom.xml
+++ b/example/application/simpleapp/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.incode</groupId>
<artifactId>incode-build</artifactId>
- <version>3-SNAPSHOT</version>
+ <version>4</version>
</parent>
<groupId>org.apache.isis.example.application</groupId>
--
To stop receiving notification emails like this one, please contact
"commits@isis.apache.org" <co...@isis.apache.org>.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch dev/2.0.0-M2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit f82a68af82db8e9cc9a972d5280f8342b74a452a
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 5 14:43:57 2018 +0000
ISIS-1767: fixes dependency convergence issue with com.sun.mail
---
core/runtime/pom.xml | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/core/runtime/pom.xml b/core/runtime/pom.xml
index 9cff140..457e5a5 100644
--- a/core/runtime/pom.xml
+++ b/core/runtime/pom.xml
@@ -122,6 +122,12 @@
<dependency>
<groupId>javax</groupId>
<artifactId>javaee-api</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>javax.mail</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
--
To stop receiving notification emails like this one, please contact
"commits@isis.apache.org" <co...@isis.apache.org>.