Author: bdekruijff at gmail.com
Date: Tue Nov 2 22:39:05 2010
New Revision: 234
Log:
AMDATU-117 Reverting to one pom in the root. See JIRA issue for motivation
Modified:
trunk/amdatu-release/pom.xml
trunk/application-bundles/pom.xml
trunk/example-bundles/pom.xml
trunk/gadget-bundles/pom.xml
trunk/integration-tests/pom.xml
trunk/libraries/pom.xml
trunk/platform-bundles/pom.xml
trunk/pom.xml
Modified: trunk/amdatu-release/pom.xml
==============================================================================
--- trunk/amdatu-release/pom.xml (original)
+++ trunk/amdatu-release/pom.xml Tue Nov 2 22:39:05 2010
@@ -2,9 +2,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.amdatu</groupId>
- <artifactId>amdatu-parent</artifactId>
+ <artifactId>amdatu</artifactId>
<version>0.0.6-SNAPSHOT</version>
- <relativePath>../pom/pom.xml</relativePath>
</parent>
<packaging>pom</packaging>
<artifactId>amdatu-release</artifactId>
Modified: trunk/application-bundles/pom.xml
==============================================================================
--- trunk/application-bundles/pom.xml (original)
+++ trunk/application-bundles/pom.xml Tue Nov 2 22:39:05 2010
@@ -4,9 +4,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.amdatu</groupId>
- <artifactId>amdatu-parent</artifactId>
+ <artifactId>amdatu</artifactId>
<version>0.0.6-SNAPSHOT</version>
- <relativePath>../pom/pom.xml</relativePath>
</parent>
<artifactId>org.amdatu.application-bundles</artifactId>
<name>Amdatu Application</name>
Modified: trunk/example-bundles/pom.xml
==============================================================================
--- trunk/example-bundles/pom.xml (original)
+++ trunk/example-bundles/pom.xml Tue Nov 2 22:39:05 2010
@@ -4,9 +4,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.amdatu</groupId>
- <artifactId>amdatu-parent</artifactId>
+ <artifactId>amdatu</artifactId>
<version>0.0.6-SNAPSHOT</version>
- <relativePath>../pom/pom.xml</relativePath>
</parent>
<artifactId>org.amdatu.example-bundles</artifactId>
<name>Amdatu Examples</name>
Modified: trunk/gadget-bundles/pom.xml
==============================================================================
--- trunk/gadget-bundles/pom.xml (original)
+++ trunk/gadget-bundles/pom.xml Tue Nov 2 22:39:05 2010
@@ -4,9 +4,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.amdatu</groupId>
- <artifactId>amdatu-parent</artifactId>
+ <artifactId>amdatu</artifactId>
<version>0.0.6-SNAPSHOT</version>
- <relativePath>../pom/pom.xml</relativePath>
</parent>
<groupId>org.amdatu</groupId>
<artifactId>org.amdatu.gadget-bundles</artifactId>
Modified: trunk/integration-tests/pom.xml
==============================================================================
--- trunk/integration-tests/pom.xml (original)
+++ trunk/integration-tests/pom.xml Tue Nov 2 22:39:05 2010
@@ -4,9 +4,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.amdatu</groupId>
- <artifactId>amdatu-parent</artifactId>
+ <artifactId>amdatu</artifactId>
<version>0.0.6-SNAPSHOT</version>
- <relativePath>../pom/pom.xml</relativePath>
</parent>
<groupId>org.amdatu.platform</groupId>
<artifactId>integration-tests</artifactId>
Modified: trunk/libraries/pom.xml
==============================================================================
--- trunk/libraries/pom.xml (original)
+++ trunk/libraries/pom.xml Tue Nov 2 22:39:05 2010
@@ -4,9 +4,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.amdatu</groupId>
- <artifactId>amdatu-parent</artifactId>
+ <artifactId>amdatu</artifactId>
<version>0.0.6-SNAPSHOT</version>
- <relativePath>../pom/pom.xml</relativePath>
</parent>
<groupId>org.amdatu</groupId>
<artifactId>org.amdatu.libraries</artifactId>
Modified: trunk/platform-bundles/pom.xml
==============================================================================
--- trunk/platform-bundles/pom.xml (original)
+++ trunk/platform-bundles/pom.xml Tue Nov 2 22:39:05 2010
@@ -4,9 +4,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.amdatu</groupId>
- <artifactId>amdatu-parent</artifactId>
+ <artifactId>amdatu</artifactId>
<version>0.0.6-SNAPSHOT</version>
- <relativePath>../pom/pom.xml</relativePath>
</parent>
<groupId>org.amdatu</groupId>
<artifactId>org.amdatu.platform-bundles</artifactId>
Modified: trunk/pom.xml
==============================================================================
--- trunk/pom.xml (original)
+++ trunk/pom.xml Tue Nov 2 22:39:05 2010
@@ -3,7 +3,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
<groupId>org.amdatu</groupId>
- <artifactId>reactor</artifactId>
+ <artifactId>amdatu</artifactId>
<version>0.0.6-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Amdatu</name>
@@ -16,6 +16,8 @@
FIXME: Subproject specific configuration should not be here. Move it when
they split off
-->
<properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+
<!--
Platform version
-->
@@ -593,6 +595,7 @@
<build>
<finalName>${project.groupId}.${project.artifactId}-${platform.version}</finalName>
+
<!-- Here we manage the plugins of all child projects -->
<pluginManagement>
<plugins>
