You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2018/02/21 09:13:13 UTC
[isis] 01/34: ISIS-1276: updates references for datanucleus.
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch dev/2.0.0-M2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 270abd032780b940ad088cdd550a121cfe4310b0
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Sep 18 22:13:20 2017 +0100
ISIS-1276: updates references for datanucleus.
Also updated org.incode:incode-build to 3-SNAPSHOT, and java-mavenmixin-datanucleus to 0.0.5-SNAPSHOT
---
core/applib/pom.xml | 39 ++--------------------------------
core/pom.xml | 19 ++++++++---------
core/unittestsupport/pom.xml | 5 ++---
example/application/helloworld/pom.xml | 2 +-
example/application/simpleapp/pom.xml | 2 +-
5 files changed, 15 insertions(+), 52 deletions(-)
diff --git a/core/applib/pom.xml b/core/applib/pom.xml
index 2d84f74..9cfea89 100644
--- a/core/applib/pom.xml
+++ b/core/applib/pom.xml
@@ -56,41 +56,6 @@
</excludes>
</resource>
</resources>
- <pluginManagement>
- <plugins>
- <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>
- org.datanucleus
- </groupId>
- <artifactId>
- datanucleus-maven-plugin
- </artifactId>
- <versionRange>
- [4.0.0-release,)
- </versionRange>
- <goals>
- <goal>enhance</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore />
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
</build>
<dependencies>
@@ -132,8 +97,8 @@
<!-- DataNucleus' standard JDO support -->
<dependency>
- <groupId>javax.jdo</groupId>
- <artifactId>jdo-api</artifactId>
+ <groupId>org.datanucleus</groupId>
+ <artifactId>javax.jdo</artifactId>
</dependency>
<!-- DataNucleus' (proprietary) type-safe query support-->
diff --git a/core/pom.xml b/core/pom.xml
index 6c43c37..9698048 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -88,14 +88,13 @@
[6] https://github.com/moment/moment/blob/develop/LICENSE</license.additional-notes>
<!-- Datanucleus Objectstore -->
- <jdo-api.version>3.1</jdo-api.version>
+ <jdo-api.version>3.2.0-m7</jdo-api.version>
- <datanucleus-core.version>4.1.7</datanucleus-core.version>
- <datanucleus-api-jdo.version>4.1.1</datanucleus-api-jdo.version>
- <datanucleus-jdo-query.version>4.0.5</datanucleus-jdo-query.version>
- <datanucleus-rdbms.version>4.1.9</datanucleus-rdbms.version>
-
- <datanucleus-jodatime.version>4.1.0-release</datanucleus-jodatime.version>
+ <datanucleus-core.version>5.1.2</datanucleus-core.version>
+ <datanucleus-api-jdo.version>5.1.2</datanucleus-api-jdo.version>
+ <datanucleus-jdo-query.version>5.0.2</datanucleus-jdo-query.version>
+ <datanucleus-rdbms.version>5.1.2</datanucleus-rdbms.version>
+ <datanucleus-jodatime.version>5.1.0-release</datanucleus-jodatime.version>
<!--
ISIS-1288: seen integration tests to fail;
domain object date holding 1-Aug-2015 after xactn retrieved as 31-Jul-2015
@@ -104,7 +103,7 @@
<datanucleus-jodatime.version>4.1.1</datanucleus-jodatime.version>
-->
- <datanucleus-maven-plugin.version>4.0.2</datanucleus-maven-plugin.version>
+ <datanucleus-maven-plugin.version>5.0.2</datanucleus-maven-plugin.version>
<shiro.version>1.2.6</shiro.version>
@@ -2025,8 +2024,8 @@ ${license.additional-notes}
<!-- DataNucleus -->
<dependency>
- <groupId>javax.jdo</groupId>
- <artifactId>jdo-api</artifactId>
+ <groupId>org.datanucleus</groupId>
+ <artifactId>javax.jdo</artifactId>
<version>${jdo-api.version}</version>
</dependency>
<dependency>
diff --git a/core/unittestsupport/pom.xml b/core/unittestsupport/pom.xml
index 51a84e7..49972f5 100644
--- a/core/unittestsupport/pom.xml
+++ b/core/unittestsupport/pom.xml
@@ -61,9 +61,8 @@
</dependency>
<dependency>
- <groupId>javax.jdo</groupId>
- <artifactId>jdo-api</artifactId>
- <version>${jdo-api.version}</version>
+ <groupId>org.datanucleus</groupId>
+ <artifactId>javax.jdo</artifactId>
<optional>true</optional>
</dependency>
diff --git a/example/application/helloworld/pom.xml b/example/application/helloworld/pom.xml
index c4570e3..002742f 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>2</version>
+ <version>3-SNAPSHOT</version>
</parent>
<groupId>org.apache.isis.example.application</groupId>
diff --git a/example/application/simpleapp/pom.xml b/example/application/simpleapp/pom.xml
index 84de916..b2af7e6 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>2</version>
+ <version>3-SNAPSHOT</version>
</parent>
<groupId>org.apache.isis.example.application</groupId>
--
To stop receiving notification emails like this one, please contact
ahuber@apache.org.