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 2015/04/24 19:31:09 UTC
[43/53] [abbrv] isis git commit: ISIS-789: refactoring pom.xml to
reduce the amount of boilerplate in domain apps for datanucleus enhancer
ISIS-789: refactoring pom.xml to reduce the amount of boilerplate in domain apps for datanucleus enhancer
(put DN enhancer plugin into a profile)
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/c053b08b
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/c053b08b
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/c053b08b
Branch: refs/heads/master
Commit: c053b08b51b48f3b9094b425bd777c42898fc399
Parents: 2e75d1c
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Apr 6 18:28:35 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Apr 6 18:28:35 2015 +0100
----------------------------------------------------------------------
core/applib/pom.xml | 29 +------------
core/metamodel/pom.xml | 16 ++++++-
core/pom.xml | 39 +++++++++++++----
core/runtime/pom.xml | 10 -----
example/application/simpleapp/dom/pom.xml | 60 +++++++++++++++++---------
example/application/simpleapp/pom.xml | 13 ++++--
tck/pom.xml | 34 ++++++++++++---
tck/tck-dom/pom.xml | 53 +++++++++++++++--------
8 files changed, 158 insertions(+), 96 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/c053b08b/core/applib/pom.xml
----------------------------------------------------------------------
diff --git a/core/applib/pom.xml b/core/applib/pom.xml
index 6560317..89fd421 100644
--- a/core/applib/pom.xml
+++ b/core/applib/pom.xml
@@ -84,25 +84,6 @@
</excludes>
</resource>
</resources>
- <plugins>
- <plugin>
- <groupId>org.datanucleus</groupId>
- <artifactId>datanucleus-maven-plugin</artifactId>
- <version>${datanucleus-maven-plugin.version}</version>
- <configuration>
- <fork>false</fork>
- <verbose>true</verbose>
- </configuration>
- <executions>
- <execution>
- <phase>compile</phase>
- <goals>
- <goal>enhance</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
<pluginManagement>
<plugins>
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
@@ -161,16 +142,10 @@
<!-- DataNucleus (jdo-api, and for enhancer) -->
<dependency>
- <groupId>org.datanucleus</groupId>
- <artifactId>datanucleus-accessplatform-jdo-rdbms</artifactId>
- <type>pom</type>
- </dependency>
- <dependency>
- <groupId>org.datanucleus</groupId>
- <artifactId>datanucleus-jodatime</artifactId>
+ <groupId>javax.jdo</groupId>
+ <artifactId>jdo-api</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-unittestsupport</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/c053b08b/core/metamodel/pom.xml
----------------------------------------------------------------------
diff --git a/core/metamodel/pom.xml b/core/metamodel/pom.xml
index cf23a83..d533cd0 100644
--- a/core/metamodel/pom.xml
+++ b/core/metamodel/pom.xml
@@ -107,14 +107,26 @@
<dependency>
<groupId>org.datanucleus</groupId>
- <artifactId>datanucleus-accessplatform-jdo-rdbms</artifactId>
- <type>pom</type>
+ <artifactId>datanucleus-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.datanucleus</groupId>
+ <artifactId>datanucleus-api-jdo</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.datanucleus</groupId>
+ <artifactId>datanucleus-jdo-query</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.datanucleus</groupId>
+ <artifactId>datanucleus-rdbms</artifactId>
</dependency>
<dependency>
<groupId>org.datanucleus</groupId>
<artifactId>datanucleus-jodatime</artifactId>
</dependency>
+
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/c053b08b/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index da30495..d5f60dc 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -93,13 +93,15 @@
[5] https://github.com/Eonasdan/bootstrap-datetimepicker/blob/master/LICENSE
[6] https://github.com/moment/moment/blob/develop/LICENSE</license.additional-notes>
- <!-- from Datanucleus Objectstore -->
- <datanucleus-accessplatform-jdo-rdbms.version>4.0.6</datanucleus-accessplatform-jdo-rdbms.version>
- <datanucleus-jodatime.version>4.0.5</datanucleus-jodatime.version>
- <datanucleus-maven-plugin.version>4.0.0-release</datanucleus-maven-plugin.version>
-
- <!-- ensure compatible with version aggregated in datanucleus-accessplatform-jdo-rdbms -->
+ <!-- Datanucleus Objectstore -->
<jdo-api.version>3.1-rc1</jdo-api.version>
+ <datanucleus-core.version>4.0.6</datanucleus-core.version>
+ <datanucleus-api-jdo.version>4.0.5</datanucleus-api-jdo.version>
+ <datanucleus-jdo-query.version>4.0.4</datanucleus-jdo-query.version>
+ <datanucleus-rdbms.version>4.0.11</datanucleus-rdbms.version>
+
+ <datanucleus-jodatime.version>4.0.6</datanucleus-jodatime.version>
+ <datanucleus-maven-plugin.version>4.0.0-release</datanucleus-maven-plugin.version>
<shiro.version>1.2.3</shiro.version>
@@ -1849,10 +1851,29 @@ ${license.additional-notes}
<!-- DataNucleus -->
<dependency>
+ <groupId>javax.jdo</groupId>
+ <artifactId>jdo-api</artifactId>
+ <version>${jdo-api.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.datanucleus</groupId>
- <artifactId>datanucleus-accessplatform-jdo-rdbms</artifactId>
- <version>${datanucleus-accessplatform-jdo-rdbms.version}</version>
- <type>pom</type>
+ <artifactId>datanucleus-core</artifactId>
+ <version>${datanucleus-core.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.datanucleus</groupId>
+ <artifactId>datanucleus-api-jdo</artifactId>
+ <version>${datanucleus-api-jdo.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.datanucleus</groupId>
+ <artifactId>datanucleus-jdo-query</artifactId>
+ <version>${datanucleus-jdo-query.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.datanucleus</groupId>
+ <artifactId>datanucleus-rdbms</artifactId>
+ <version>${datanucleus-rdbms.version}</version>
</dependency>
<dependency>
<groupId>org.datanucleus</groupId>
http://git-wip-us.apache.org/repos/asf/isis/blob/c053b08b/core/runtime/pom.xml
----------------------------------------------------------------------
diff --git a/core/runtime/pom.xml b/core/runtime/pom.xml
index 83d17b1..ff97095 100644
--- a/core/runtime/pom.xml
+++ b/core/runtime/pom.xml
@@ -143,16 +143,6 @@
</dependency>
<dependency>
- <groupId>org.datanucleus</groupId>
- <artifactId>datanucleus-accessplatform-jdo-rdbms</artifactId>
- <type>pom</type>
- </dependency>
- <dependency>
- <groupId>org.datanucleus</groupId>
- <artifactId>datanucleus-jodatime</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/isis/blob/c053b08b/example/application/simpleapp/dom/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/dom/pom.xml b/example/application/simpleapp/dom/pom.xml
index 8237b13..98a78c3 100644
--- a/example/application/simpleapp/dom/pom.xml
+++ b/example/application/simpleapp/dom/pom.xml
@@ -79,27 +79,6 @@
</plugin>
</plugins>
</pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.datanucleus</groupId>
- <artifactId>datanucleus-maven-plugin</artifactId>
- <version>${datanucleus-maven-plugin.version}</version>
- <configuration>
- <fork>false</fork>
- <log4jConfiguration>${basedir}/log4j.properties</log4jConfiguration>
- <verbose>true</verbose>
- <props>${basedir}/datanucleus.properties</props>
- </configuration>
- <executions>
- <execution>
- <phase>compile</phase>
- <goals>
- <goal>enhance</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
</build>
<dependencies>
@@ -124,6 +103,45 @@
<profiles>
<profile>
+ <id>enhance</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.datanucleus</groupId>
+ <artifactId>datanucleus-maven-plugin</artifactId>
+ <version>${datanucleus-maven-plugin.version}</version>
+ <configuration>
+ <fork>false</fork>
+ <log4jConfiguration>${basedir}/log4j.properties</log4jConfiguration>
+ <verbose>true</verbose>
+ <props>${basedir}/datanucleus.properties</props>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>enhance</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.datanucleus</groupId>
+ <artifactId>datanucleus-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.datanucleus</groupId>
+ <artifactId>datanucleus-api-jdo</artifactId>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
<id>isis-validate</id>
<activation>
<activeByDefault>false</activeByDefault>
http://git-wip-us.apache.org/repos/asf/isis/blob/c053b08b/example/application/simpleapp/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/pom.xml b/example/application/simpleapp/pom.xml
index 6e7c216..8db489d 100644
--- a/example/application/simpleapp/pom.xml
+++ b/example/application/simpleapp/pom.xml
@@ -37,10 +37,16 @@
<isis.version>1.9.0_dn4-SNAPSHOT</isis.version>
<!-- must be consistent with the versions defined by the JDO Objectstore -->
- <datanucleus-accessplatform-jdo-rdbms.version>4.0.4</datanucleus-accessplatform-jdo-rdbms.version>
- <datanucleus-jodatime.version>4.0.4</datanucleus-jodatime.version>
+
+ <!--<jdo-api.version>3.1-rc1</jdo-api.version>-->
+ <datanucleus-core.version>4.0.6</datanucleus-core.version>
+ <datanucleus-api-jdo.version>4.0.5</datanucleus-api-jdo.version>
<datanucleus-maven-plugin.version>4.0.0-release</datanucleus-maven-plugin.version>
-
+ <!--<datanucleus-jdo-query.version>4.0.4</datanucleus-jdo-query.version>-->
+ <!--<datanucleus-rdbms.version>4.0.11</datanucleus-rdbms.version>-->
+
+ <!--<datanucleus-jodatime.version>4.0.6</datanucleus-jodatime.version>-->
+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>
@@ -358,7 +364,6 @@
<version>${project.version}</version>
</dependency>
-
</dependencies>
</dependencyManagement>
http://git-wip-us.apache.org/repos/asf/isis/blob/c053b08b/tck/pom.xml
----------------------------------------------------------------------
diff --git a/tck/pom.xml b/tck/pom.xml
index 2f564a6..f82522d 100644
--- a/tck/pom.xml
+++ b/tck/pom.xml
@@ -36,8 +36,13 @@
<properties>
<!-- must be consistent with the versions defined by the JDO Objectstore -->
- <datanucleus-accessplatform-jdo-rdbms.version>4.0.4</datanucleus-accessplatform-jdo-rdbms.version>
- <datanucleus-jodatime.version>4.0.4</datanucleus-jodatime.version>
+ <jdo-api.version>3.1-rc1</jdo-api.version>
+ <datanucleus-core.version>4.0.6</datanucleus-core.version>
+ <datanucleus-api-jdo.version>4.0.5</datanucleus-api-jdo.version>
+ <datanucleus-jdo-query.version>4.0.4</datanucleus-jdo-query.version>
+ <datanucleus-rdbms.version>4.0.11</datanucleus-rdbms.version>
+
+ <datanucleus-jodatime.version>4.0.6</datanucleus-jodatime.version>
<datanucleus-maven-plugin.version>4.0.0-release</datanucleus-maven-plugin.version>
</properties>
@@ -152,10 +157,29 @@
<!-- DataNucleus -->
<dependency>
+ <groupId>javax.jdo</groupId>
+ <artifactId>jdo-api</artifactId>
+ <version>${jdo-api.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.datanucleus</groupId>
+ <artifactId>datanucleus-core</artifactId>
+ <version>${datanucleus-core.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.datanucleus</groupId>
+ <artifactId>datanucleus-api-jdo</artifactId>
+ <version>${datanucleus-api-jdo.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.datanucleus</groupId>
+ <artifactId>datanucleus-jdo-query</artifactId>
+ <version>${datanucleus-jdo-query.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.datanucleus</groupId>
- <artifactId>datanucleus-accessplatform-jdo-rdbms</artifactId>
- <version>${datanucleus-accessplatform-jdo-rdbms.version}</version>
- <type>pom</type>
+ <artifactId>datanucleus-rdbms</artifactId>
+ <version>${datanucleus-rdbms.version}</version>
</dependency>
<dependency>
<groupId>org.datanucleus</groupId>
http://git-wip-us.apache.org/repos/asf/isis/blob/c053b08b/tck/tck-dom/pom.xml
----------------------------------------------------------------------
diff --git a/tck/tck-dom/pom.xml b/tck/tck-dom/pom.xml
index a1e3080..0137a64 100644
--- a/tck/tck-dom/pom.xml
+++ b/tck/tck-dom/pom.xml
@@ -16,17 +16,19 @@
KIND, either express or implied. See the License for the
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/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
+-->
+<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/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.isis.tck</groupId>
- <artifactId>isis-tck</artifactId>
+ <parent>
+ <groupId>org.apache.isis.tck</groupId>
+ <artifactId>isis-tck</artifactId>
<version>1.9.0_dn4-SNAPSHOT</version>
- </parent>
+ </parent>
- <artifactId>isis-tck-dom</artifactId>
- <name>Isis TCK DOM</name>
+ <artifactId>isis-tck-dom</artifactId>
+ <name>Isis TCK DOM</name>
<profiles>
<profile>
@@ -57,7 +59,7 @@
</execution>
</executions>
</plugin>
-
+
</plugins>
<pluginManagement>
<plugins>
@@ -85,7 +87,7 @@
</goals>
</pluginExecutionFilter>
<action>
- <ignore />
+ <ignore/>
</action>
</pluginExecution>
</pluginExecutions>
@@ -98,17 +100,32 @@
</profile>
</profiles>
- <dependencies>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-applib</artifactId>
- </dependency>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-applib</artifactId>
+ </dependency>
<!-- DataNucleus -->
<dependency>
+ <groupId>javax.jdo</groupId>
+ <artifactId>jdo-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.datanucleus</groupId>
+ <artifactId>datanucleus-core</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.datanucleus</groupId>
- <artifactId>datanucleus-accessplatform-jdo-rdbms</artifactId>
- <type>pom</type>
+ <artifactId>datanucleus-api-jdo</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.datanucleus</groupId>
+ <artifactId>datanucleus-jdo-query</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.datanucleus</groupId>
+ <artifactId>datanucleus-rdbms</artifactId>
</dependency>
<dependency>
<groupId>org.datanucleus</groupId>
@@ -116,5 +133,5 @@
</dependency>
</dependencies>
-
+
</project>