Author: ivol
Date: Wed Oct 6 13:50:56 2010
New Revision: 138
Log:
[AMDATU-100]
Fixed inheritance of plugin configuration
Modified:
trunk/application-bundles/dashboard-bundle/pom.xml
trunk/application-bundles/gadget-management/pom.xml
trunk/application-bundles/pom.xml
trunk/example-bundles/course-gadget/pom.xml
trunk/example-bundles/course-service/pom.xml
trunk/example-bundles/friends-gadget/pom.xml
trunk/example-bundles/pom.xml
trunk/gadget-bundles/login-gadget/pom.xml
trunk/gadget-bundles/pom.xml
trunk/gadget-bundles/sparqlendpoint-gadget/pom.xml
trunk/libraries/amdatu-utilities/pom.xml
trunk/platform-bundles/authorization-service/pom.xml
trunk/platform-bundles/cassandra-application/pom.xml
trunk/platform-bundles/cassandra-listener/pom.xml
trunk/platform-bundles/cassandra-persistencemanager/pom.xml
trunk/platform-bundles/config-template-manager/pom.xml
trunk/platform-bundles/httpcontext/pom.xml
trunk/platform-bundles/loghandler/pom.xml
trunk/platform-bundles/pom.xml
trunk/platform-bundles/profile-service/pom.xml
trunk/platform-bundles/sesame-application/pom.xml
trunk/platform-bundles/shindig-application/pom.xml
trunk/platform-bundles/tenant-service/pom.xml
trunk/platform-bundles/useradmin-cassandra-store/pom.xml
trunk/platform-bundles/wink-application/pom.xml
trunk/pom.xml
trunk/test-bundles/integrationtest-bundle/pom.xml
trunk/test-bundles/pom.xml
Modified: trunk/application-bundles/dashboard-bundle/pom.xml
==============================================================================
--- trunk/application-bundles/dashboard-bundle/pom.xml (original)
+++ trunk/application-bundles/dashboard-bundle/pom.xml Wed Oct 6 13:50:56 2010
@@ -31,7 +31,6 @@
</dependencies>
<build>
-
<finalName>${project.groupId}.${project.artifactId}-${platform.version}</finalName>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
@@ -44,23 +43,8 @@
</instructions>
</configuration>
</plugin>
-
- <!-- FIXME: can we move this in some way to the parent
pom and use inheritence? -->
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <copy
file="${project.build.directory}/${project.build.finalName}.jar"
todir="${root.directory}/application-bundles" overwrite="true" />
- </tasks>
- </configuration>
- </execution>
- </executions>
</plugin>
</plugins>
</build>
Modified: trunk/application-bundles/gadget-management/pom.xml
==============================================================================
--- trunk/application-bundles/gadget-management/pom.xml (original)
+++ trunk/application-bundles/gadget-management/pom.xml Wed Oct 6 13:50:56 2010
@@ -62,7 +62,6 @@
</dependencies>
<build>
-
<finalName>${project.groupId}.${project.artifactId}-${platform.version}</finalName>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
@@ -77,23 +76,8 @@
</instructions>
</configuration>
</plugin>
-
- <!-- FIXME: can we move this in some way to the parent
pom and use inheritence? -->
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <copy
file="${project.build.directory}/${project.build.finalName}.jar"
todir="${root.directory}/application-bundles" overwrite="true" />
- </tasks>
- </configuration>
- </execution>
- </executions>
</plugin>
</plugins>
</build>
Modified: trunk/application-bundles/pom.xml
==============================================================================
--- trunk/application-bundles/pom.xml (original)
+++ trunk/application-bundles/pom.xml Wed Oct 6 13:50:56 2010
@@ -24,4 +24,28 @@
<module>gadget-management</module>
</modules>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <!-- This plugin ensures that the resulting jar
is also copied to the proper
+ target directory, bound to the package
phase -->
+ <plugin>
+
<artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <copy
file="${project.build.directory}/${project.build.finalName}.jar"
todir="${root.directory}/application-bundles" overwrite="true" />
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
</project>
\ No newline at end of file
Modified: trunk/example-bundles/course-gadget/pom.xml
==============================================================================
--- trunk/example-bundles/course-gadget/pom.xml (original)
+++ trunk/example-bundles/course-gadget/pom.xml Wed Oct 6 13:50:56 2010
@@ -26,7 +26,6 @@
</dependencies>
<build>
-
<finalName>${project.groupId}.${project.artifactId}-${platform.version}</finalName>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
@@ -42,20 +41,6 @@
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <copy
file="${project.build.directory}/${project.build.finalName}.jar"
todir="${root.directory}/example-bundles" overwrite="true" />
- <copy
file="${project.build.directory}/classes/conf/org.amdatu.example.course.gadget.cfg"
todir="${deploy.directory}" overwrite="true" />
- </tasks>
- </configuration>
- </execution>
- </executions>
</plugin>
</plugins>
Modified: trunk/example-bundles/course-service/pom.xml
==============================================================================
--- trunk/example-bundles/course-service/pom.xml (original)
+++ trunk/example-bundles/course-service/pom.xml Wed Oct 6 13:50:56 2010
@@ -79,8 +79,6 @@
</dependencies>
<build>
-
<finalName>${project.groupId}.${project.artifactId}-${platform.version}</finalName>
-
<resources>
<resource>
<directory>src/main/resources</directory>
@@ -120,20 +118,6 @@
<!-- FIXME: can we move this in some way to the parent
pom and use inheritence? -->
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <copy
file="${project.build.directory}/${project.build.finalName}.jar"
todir="${root.directory}/example-bundles" overwrite="true" />
- <copy
file="${project.build.directory}/classes/conf/org.amdatu.example.course.service.cfg"
todir="${deploy.directory}" overwrite="true" />
- </tasks>
- </configuration>
- </execution>
- </executions>
</plugin>
</plugins>
Modified: trunk/example-bundles/friends-gadget/pom.xml
==============================================================================
--- trunk/example-bundles/friends-gadget/pom.xml (original)
+++ trunk/example-bundles/friends-gadget/pom.xml Wed Oct 6 13:50:56 2010
@@ -26,7 +26,6 @@
</dependencies>
<build>
-
<finalName>${project.groupId}.${project.artifactId}-${platform.version}</finalName>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
@@ -42,20 +41,6 @@
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <copy
file="${project.build.directory}/${project.build.finalName}.jar"
todir="${root.directory}/example-bundles" overwrite="true" />
- <copy
file="${project.build.directory}/classes/conf/org.amdatu.example.friends.gadget.cfg"
todir="${deploy.directory}" overwrite="true" />
- </tasks>
- </configuration>
- </execution>
- </executions>
</plugin>
</plugins>
Modified: trunk/example-bundles/pom.xml
==============================================================================
--- trunk/example-bundles/pom.xml (original)
+++ trunk/example-bundles/pom.xml Wed Oct 6 13:50:56 2010
@@ -24,4 +24,29 @@
<module>course-service</module>
<module>friends-gadget</module>
</modules>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <!-- This plugin ensures that the resulting jar
is also copied to the proper
+ target directory, bound to the package
phase -->
+ <plugin>
+
<artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <copy
file="${project.build.directory}/${project.build.finalName}.jar"
todir="${root.directory}/example-bundles" overwrite="true" />
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
</project>
\ No newline at end of file
Modified: trunk/gadget-bundles/login-gadget/pom.xml
==============================================================================
--- trunk/gadget-bundles/login-gadget/pom.xml (original)
+++ trunk/gadget-bundles/login-gadget/pom.xml Wed Oct 6 13:50:56 2010
@@ -37,7 +37,6 @@
</dependencies>
<build>
-
<finalName>${project.groupId}.${project.artifactId}-${platform.version}</finalName>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
@@ -55,20 +54,6 @@
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <copy
file="${project.build.directory}/${project.build.finalName}.jar"
todir="${root.directory}/gadget-bundles" overwrite="true" />
- <copy
file="${project.build.directory}/classes/conf/org.amdatu.gadget.login.service.cfg"
todir="${deploy.directory}" overwrite="true" />
- </tasks>
- </configuration>
- </execution>
- </executions>
</plugin>
</plugins>
Modified: trunk/gadget-bundles/pom.xml
==============================================================================
--- trunk/gadget-bundles/pom.xml (original)
+++ trunk/gadget-bundles/pom.xml Wed Oct 6 13:50:56 2010
@@ -29,4 +29,28 @@
<module>sparqlendpoint-gadget</module>
</modules>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <!-- This plugin ensures that the resulting jar
is also copied to the proper
+ target directory, bound to the package
phase -->
+ <plugin>
+
<artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <copy
file="${project.build.directory}/${project.build.finalName}.jar"
todir="${root.directory}/gadget-bundles" overwrite="true" />
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
</project>
\ No newline at end of file
Modified: trunk/gadget-bundles/sparqlendpoint-gadget/pom.xml
==============================================================================
--- trunk/gadget-bundles/sparqlendpoint-gadget/pom.xml (original)
+++ trunk/gadget-bundles/sparqlendpoint-gadget/pom.xml Wed Oct 6 13:50:56 2010
@@ -37,7 +37,6 @@
</dependencies>
<build>
-
<finalName>${project.groupId}.${project.artifactId}-${platform.version}</finalName>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
@@ -58,20 +57,6 @@
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <copy
file="${project.build.directory}/${project.build.finalName}.jar"
todir="${root.directory}/gadget-bundles" overwrite="true" />
- <copy
file="${project.build.directory}/classes/conf/org.amdatu.gadget.sparqlendpoint.cfg"
todir="${deploy.directory}" overwrite="true" />
- </tasks>
- </configuration>
- </execution>
- </executions>
</plugin>
</plugins>
Modified: trunk/libraries/amdatu-utilities/pom.xml
==============================================================================
--- trunk/libraries/amdatu-utilities/pom.xml (original)
+++ trunk/libraries/amdatu-utilities/pom.xml Wed Oct 6 13:50:56 2010
@@ -12,10 +12,6 @@
<packaging>jar</packaging>
<name>Amdatu Libraries - Utilities</name>
- <dependencies>
-
- </dependencies>
-
<build>
<finalName>${project.groupId}.${project.artifactId}-${platform.version}</finalName>
</build>
Modified: trunk/platform-bundles/authorization-service/pom.xml
==============================================================================
--- trunk/platform-bundles/authorization-service/pom.xml (original)
+++ trunk/platform-bundles/authorization-service/pom.xml Wed Oct 6
13:50:56 2010
@@ -49,7 +49,6 @@
</dependencies>
<build>
-
<finalName>${project.groupId}.${project.artifactId}-${platform.version}</finalName>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
@@ -68,19 +67,6 @@
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <copy
file="${project.build.directory}/${project.build.finalName}.jar"
todir="${root.directory}/platform-bundles" overwrite="true" />
- </tasks>
- </configuration>
- </execution>
- </executions>
</plugin>
</plugins>
Modified: trunk/platform-bundles/cassandra-application/pom.xml
==============================================================================
--- trunk/platform-bundles/cassandra-application/pom.xml (original)
+++ trunk/platform-bundles/cassandra-application/pom.xml Wed Oct 6
13:50:56 2010
@@ -56,7 +56,6 @@
</dependencies>
<build>
-
<finalName>${project.groupId}.${project.artifactId}-${cassandra.version}</finalName>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
@@ -138,20 +137,6 @@
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <copy
file="${project.build.directory}/${project.build.finalName}.jar"
todir="${root.directory}/platform-bundles" overwrite="true" />
- <copy
file="${project.build.directory}/classes/conf/org.amdatu.platform.cassandra.application.cfg"
todir="${deploy.directory}" overwrite="true" />
- </tasks>
- </configuration>
- </execution>
- </executions>
</plugin>
</plugins>
Modified: trunk/platform-bundles/cassandra-listener/pom.xml
==============================================================================
--- trunk/platform-bundles/cassandra-listener/pom.xml (original)
+++ trunk/platform-bundles/cassandra-listener/pom.xml Wed Oct 6 13:50:56 2010
@@ -26,7 +26,6 @@
</dependencies>
<build>
-
<finalName>${project.groupId}.${project.artifactId}-${platform.version}</finalName>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
@@ -42,19 +41,6 @@
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <copy
file="${project.build.directory}/${project.build.finalName}.jar"
todir="${root.directory}/platform-bundles" overwrite="true" />
- </tasks>
- </configuration>
- </execution>
- </executions>
</plugin>
</plugins>
Modified: trunk/platform-bundles/cassandra-persistencemanager/pom.xml
==============================================================================
--- trunk/platform-bundles/cassandra-persistencemanager/pom.xml (original)
+++ trunk/platform-bundles/cassandra-persistencemanager/pom.xml Wed Oct 6
13:50:56 2010
@@ -21,7 +21,6 @@
</dependencies>
<build>
-
<finalName>${project.groupId}.${project.artifactId}-${platform.version}</finalName>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
@@ -38,19 +37,6 @@
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <copy
file="${project.build.directory}/${project.build.finalName}.jar"
todir="${root.directory}/platform-bundles" overwrite="true" />
- </tasks>
- </configuration>
- </execution>
- </executions>
</plugin>
</plugins>
Modified: trunk/platform-bundles/config-template-manager/pom.xml
==============================================================================
--- trunk/platform-bundles/config-template-manager/pom.xml (original)
+++ trunk/platform-bundles/config-template-manager/pom.xml Wed Oct 6
13:50:56 2010
@@ -20,9 +20,7 @@
</dependency>
</dependencies>
- <build>
-
<finalName>${project.groupId}.${project.artifactId}-${platform.version}</finalName>
-
+ <build>
<resources>
<resource>
<directory>src/main/resources</directory>
@@ -58,20 +56,6 @@
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <copy
file="${project.build.directory}/${project.build.finalName}.jar"
todir="${root.directory}/platform-bundles" overwrite="true" />
- <copy
file="${project.build.directory}/classes/conf/org.amdatu.platform.configtemplatemanager.cfg"
todir="${deploy.directory}" overwrite="true" />
- </tasks>
- </configuration>
- </execution>
- </executions>
</plugin>
</plugins>
Modified: trunk/platform-bundles/httpcontext/pom.xml
==============================================================================
--- trunk/platform-bundles/httpcontext/pom.xml (original)
+++ trunk/platform-bundles/httpcontext/pom.xml Wed Oct 6 13:50:56 2010
@@ -47,7 +47,6 @@
</dependencies>
<build>
-
<finalName>${project.groupId}.${project.artifactId}-${platform.version}</finalName>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
@@ -78,19 +77,6 @@
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <copy
file="${project.build.directory}/${project.build.finalName}.jar"
todir="${root.directory}/platform-bundles" overwrite="true" />
- </tasks>
- </configuration>
- </execution>
- </executions>
</plugin>
</plugins>
Modified: trunk/platform-bundles/loghandler/pom.xml
==============================================================================
--- trunk/platform-bundles/loghandler/pom.xml (original)
+++ trunk/platform-bundles/loghandler/pom.xml Wed Oct 6 13:50:56 2010
@@ -22,7 +22,6 @@
</dependencies>
<build>
-
<finalName>${project.groupId}.${project.artifactId}-${platform.version}</finalName>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
@@ -46,20 +45,6 @@
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <copy
file="${project.build.directory}/${project.build.finalName}.jar"
todir="${root.directory}/platform-bundles" overwrite="true" />
- <copy
file="${project.build.directory}/classes/conf/org.amdatu.platform.loghandler.cfg"
todir="${deploy.directory}" overwrite="true" />
- </tasks>
- </configuration>
- </execution>
- </executions>
</plugin>
</plugins>
Modified: trunk/platform-bundles/pom.xml
==============================================================================
--- trunk/platform-bundles/pom.xml (original)
+++ trunk/platform-bundles/pom.xml Wed Oct 6 13:50:56 2010
@@ -27,4 +27,28 @@
<module>wink-application</module>
</modules>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <!-- This plugin ensures that the resulting jar
is also copied to the proper
+ target directory, bound to the package
phase -->
+ <plugin>
+
<artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <copy
file="${project.build.directory}/${project.build.finalName}.jar"
todir="${root.directory}/platform-bundles" overwrite="true" />
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
</project>
\ No newline at end of file
Modified: trunk/platform-bundles/profile-service/pom.xml
==============================================================================
--- trunk/platform-bundles/profile-service/pom.xml (original)
+++ trunk/platform-bundles/profile-service/pom.xml Wed Oct 6 13:50:56 2010
@@ -47,7 +47,6 @@
</dependencies>
<build>
-
<finalName>${project.groupId}.${project.artifactId}-${platform.version}</finalName>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
@@ -66,19 +65,6 @@
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <copy
file="${project.build.directory}/${project.build.finalName}.jar"
todir="${root.directory}/platform-bundles" overwrite="true" />
- </tasks>
- </configuration>
- </execution>
- </executions>
</plugin>
</plugins>
Modified: trunk/platform-bundles/sesame-application/pom.xml
==============================================================================
--- trunk/platform-bundles/sesame-application/pom.xml (original)
+++ trunk/platform-bundles/sesame-application/pom.xml Wed Oct 6 13:50:56 2010
@@ -23,7 +23,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
- <version>1.5.10</version>
+ <version>1.5.11</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -34,8 +34,6 @@
</dependencies>
<build>
-
<finalName>${project.groupId}.${project.artifactId}-${org.openrdf.sesame.version}</finalName>
-
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
@@ -60,19 +58,6 @@
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <copy
file="${project.build.directory}/${project.build.finalName}.jar"
todir="${root.directory}/platform-bundles" overwrite="true" />
- </tasks>
- </configuration>
- </execution>
- </executions>
</plugin>
</plugins>
Modified: trunk/platform-bundles/shindig-application/pom.xml
==============================================================================
--- trunk/platform-bundles/shindig-application/pom.xml (original)
+++ trunk/platform-bundles/shindig-application/pom.xml Wed Oct 6 13:50:56 2010
@@ -71,8 +71,6 @@
</dependencies>
<build>
-
<finalName>${project.groupId}.${project.artifactId}-${shindig.version}</finalName>
-
<resources>
<resource>
<directory>src/main/resources</directory>
@@ -165,19 +163,6 @@
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <copy
file="${project.build.directory}/${project.build.finalName}.jar"
todir="${root.directory}/platform-bundles" overwrite="true" />
- </tasks>
- </configuration>
- </execution>
- </executions>
</plugin>
</plugins>
Modified: trunk/platform-bundles/tenant-service/pom.xml
==============================================================================
--- trunk/platform-bundles/tenant-service/pom.xml (original)
+++ trunk/platform-bundles/tenant-service/pom.xml Wed Oct 6 13:50:56 2010
@@ -31,7 +31,6 @@
</dependencies>
<build>
-
<finalName>${project.groupId}.${project.artifactId}-${platform.version}</finalName>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
@@ -50,19 +49,6 @@
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <copy
file="${project.build.directory}/${project.build.finalName}.jar"
todir="${root.directory}/platform-bundles" overwrite="true" />
- </tasks>
- </configuration>
- </execution>
- </executions>
</plugin>
</plugins>
Modified: trunk/platform-bundles/useradmin-cassandra-store/pom.xml
==============================================================================
--- trunk/platform-bundles/useradmin-cassandra-store/pom.xml (original)
+++ trunk/platform-bundles/useradmin-cassandra-store/pom.xml Wed Oct 6
13:50:56 2010
@@ -63,8 +63,7 @@
</dependencies>
<build>
-
<finalName>${project.groupId}.${project.artifactId}-${platform.version}</finalName>
- <plugins>
+ <plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
@@ -82,19 +81,6 @@
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <copy
file="${project.build.directory}/${project.build.finalName}.jar"
todir="${root.directory}/platform-bundles" overwrite="true" />
- </tasks>
- </configuration>
- </execution>
- </executions>
</plugin>
<plugin>
Modified: trunk/platform-bundles/wink-application/pom.xml
==============================================================================
--- trunk/platform-bundles/wink-application/pom.xml (original)
+++ trunk/platform-bundles/wink-application/pom.xml Wed Oct 6 13:50:56 2010
@@ -46,7 +46,6 @@
</dependencies>
<build>
-
<finalName>${project.groupId}.${project.artifactId}-${org.apache.wink.version}</finalName>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
@@ -73,19 +72,6 @@
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <copy
file="${project.build.directory}/${project.build.finalName}.jar"
todir="${root.directory}/platform-bundles" overwrite="true" />
- </tasks>
- </configuration>
- </execution>
- </executions>
</plugin>
</plugins>
Modified: trunk/pom.xml
==============================================================================
--- trunk/pom.xml (original)
+++ trunk/pom.xml Wed Oct 6 13:50:56 2010
@@ -425,6 +425,8 @@
<!-- Build section, handles project's directory structure and plugins
-->
<build>
+
<finalName>${project.groupId}.${project.artifactId}-${platform.version}</finalName>
+
<plugins>
<!-- Specify the exact maven plugin version here, since
some versions have issues with
resource filtering in versions 2.7 and
2.8 (see
Modified: trunk/test-bundles/integrationtest-bundle/pom.xml
==============================================================================
--- trunk/test-bundles/integrationtest-bundle/pom.xml (original)
+++ trunk/test-bundles/integrationtest-bundle/pom.xml Wed Oct 6 13:50:56 2010
@@ -46,7 +46,6 @@
</dependencies>
<build>
-
<finalName>${project.groupId}.${project.artifactId}-${platform.version}</finalName>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
@@ -65,19 +64,6 @@
<!-- FIXME: can we move this in some way to the parent
pom and use inheritence? -->
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <copy
file="${project.build.directory}/${project.build.finalName}.jar"
todir="${deploy.directory}" overwrite="true" />
- </tasks>
- </configuration>
- </execution>
- </executions>
</plugin>
</plugins>
</build>
Modified: trunk/test-bundles/pom.xml
==============================================================================
--- trunk/test-bundles/pom.xml (original)
+++ trunk/test-bundles/pom.xml Wed Oct 6 13:50:56 2010
@@ -23,4 +23,28 @@
<module>integrationtest-bundle</module>
</modules>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <!-- This plugin ensures that the resulting jar
is also copied to the proper
+ target directory, bound to the package
phase -->
+ <plugin>
+
<artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <copy
file="${project.build.directory}/${project.build.finalName}.jar"
todir="${deploy.directory}" overwrite="true" />
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
</project>
\ No newline at end of file
