Author: bdekruijff at gmail.com Date: Fri Oct 29 18:11:16 2010 New Revision: 223
Log: AMDATU-117 Let reatcor inherit from parent / Move build concerns to reactor Modified: trunk/pom.xml trunk/pom/pom.xml Modified: trunk/pom.xml ============================================================================== --- trunk/pom.xml (original) +++ trunk/pom.xml Fri Oct 29 18:11:16 2010 @@ -2,6 +2,12 @@ <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.amdatu</groupId> + <artifactId>amdatu-parent</artifactId> + <relativePath>pom/pom.xml</relativePath> + <version>0.0.6-SNAPSHOT</version> + </parent> <groupId>org.amdatu</groupId> <artifactId>reactor</artifactId> <version>0.0.6-SNAPSHOT</version> @@ -14,12 +20,244 @@ placed in the Amdatu Parent POM under pom/pom.xml. --> <modules> + <module>pom</module> <module>amdatu-release</module> <module>platform-bundles</module> <module>application-bundles</module> <module>gadget-bundles</module> <module>libraries</module> <module>example-bundles</module> + <!-- <module>integration-tests</module> - </modules> + --> + </modules> + + <build> + <plugins> + + <!-- + Since the Felix dependency manager 3.0.0 is not yet available in online maven repositories, it must be + installed to the local maven repository. We use the maven-install-plugin to do so during build + --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-install-plugin</artifactId> + <inherited>false</inherited> + <executions> + <execution> + <id>install-felix-dependency-manager</id> + <phase>initialize</phase> + <goals> + <goal>install-file</goal> + </goals> + <configuration> + <file>src/main/resources/lib/org.apache.felix.dependencymanager-3.0.0-SNAPSHOT.jar</file> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.dependencymanager</artifactId> + <version>${org.apache.felix.dependencymanager.version}</version> + <packaging>jar</packaging> + </configuration> + </execution> + + <execution> + <id>install-commons-logging-osgi-adapter</id> + <phase>initialize</phase> + <goals> + <goal>install-file</goal> + </goals> + <configuration> + <file>src/main/resources/lib/commons-logging-osgi-20081215.jar</file> + <groupId>net.kornr.osgi</groupId> + <artifactId>commons-logging-osgi</artifactId> + <version>${net.kornr.osgi.commons-logging-osgi.version}</version> + <packaging>jar</packaging> + </configuration> + </execution> + + <execution> + <id>install-felix-dependency-manager-shell</id> + <phase>initialize</phase> + <goals> + <goal>install-file</goal> + </goals> + <configuration> + <file>src/main/resources/lib/org.apache.felix.dependencymanager.shell-3.0.0-SNAPSHOT.jar</file> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.dependencymanager.shell</artifactId> + <version>${org.apache.felix.dependencymanager.version}</version> + <packaging>jar</packaging> + </configuration> + </execution> + + <execution> + <id>install-pax-dependency-manager</id> + <phase>initialize</phase> + <goals> + <goal>install-file</goal> + </goals> + <configuration> + <file>src/main/resources/lib/pax-useradmin-service-0.0.1-SNAPSHOT.jar</file> + <groupId>org.ops4j.pax.useradmin</groupId> + <artifactId>pax-useradmin-service</artifactId> + <version>${pax.useradmin.version}</version> + <packaging>jar</packaging> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <inherited>false</inherited> + <executions> + <!-- Copy all system bundles --> + <execution> + <id>copy-system-runtime-bundles</id> + <phase>compile</phase> + <goals> + <goal>copy-dependencies</goal> + </goals> + <configuration> + <outputDirectory>${root.directory}/system-bundles</outputDirectory> + <excludeTransitive>true</excludeTransitive> + <includeScope>runtime</includeScope> + <includeGroupIds>org.apache.felix,org.ops4j.pax.web,org.ops4j.pax.useradmin,org.apache.sling</includeGroupIds> + </configuration> + </execution> + <execution> + <id>copy-system-provided-bundles</id> + <phase>compile</phase> + <goals> + <goal>copy-dependencies</goal> + </goals> + <configuration> + <outputDirectory>${root.directory}/system-bundles</outputDirectory> + <excludeTransitive>true</excludeTransitive> + <includeScope>provided</includeScope> + <includeGroupIds>org.apache.felix,org.ops4j.pax.web,org.apache.sling</includeGroupIds> + </configuration> + </execution> + + <!-- Copy all platform bundles --> + <execution> + <id>copy-platform-bundles</id> + <phase>package</phase> + <goals> + <goal>copy-dependencies</goal> + </goals> + <configuration> + <outputDirectory>${root.directory}/platform-bundles</outputDirectory> + <excludeTransitive>true</excludeTransitive> + <includeScope>provided</includeScope> + <includeGroupIds>org.amdatu.platform-bundles</includeGroupIds> + <excludeTypes>jar</excludeTypes> + </configuration> + </execution> + </executions> + </plugin> + + <!-- Copy configuration files --> + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <inherited>false</inherited> + <version>2.4.3</version> + <executions> + <execution> + <id>copy-conf</id> + <phase>install</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${conf.directory}</outputDirectory> + <resources> + <resource> + <directory>src/main/resources/conf</directory> + <filtering>true</filtering> + </resource> + </resources> + </configuration> + </execution> + <execution> + <id>copy-shell</id> + <phase>install</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${root.directory}</outputDirectory> + <resources> + <resource> + <directory>src/main/resources/shell</directory> + <filtering>true</filtering> + </resource> + </resources> + </configuration> + </execution> + <execution> + <id>copy-shortcuts</id> + <phase>install</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${root.directory}</outputDirectory> + <resources> + <resource> + <directory>src/main/resources/shortcuts</directory> + <filtering>true</filtering> + </resource> + </resources> + </configuration> + </execution> + <execution> + <id>copy-configs</id> + <phase>install</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${deploy.directory}</outputDirectory> + <resources> + <resource> + <directory>platform-bundles/cassandra-application/src/main/resources/conf</directory> + <filtering>true</filtering> + </resource> + <resource> + <directory>example-bundles/course-gadget/src/main/resources/conf</directory> + <filtering>true</filtering> + </resource> + <resource> + <directory>example-bundles/course-service/src/main/resources/conf</directory> + <filtering>true</filtering> + </resource> + <resource> + <directory>example-bundles/friends-gadget/src/main/resources/conf</directory> + <filtering>true</filtering> + </resource> + <resource> + <directory>gadget-bundles/login-gadget/src/main/resources/conf</directory> + <filtering>true</filtering> + </resource> + <resource> + <directory>gadget-bundles/sparqlendpoint-gadget/src/main/resources/conf</directory> + <filtering>true</filtering> + </resource> + <resource> + <directory>platform-bundles/loghandler/src/main/resources/conf</directory> + <filtering>true</filtering> + </resource> + <resource> + <directory>platform-bundles/config-template-manager/src/main/resources/conf</directory> + <filtering>true</filtering> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> + + </plugins> + </build> </project> Modified: trunk/pom/pom.xml ============================================================================== --- trunk/pom/pom.xml (original) +++ trunk/pom/pom.xml Fri Oct 29 18:11:16 2010 @@ -3,9 +3,9 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.amdatu</groupId> <artifactId>amdatu-parent</artifactId> + <version>0.0.6-SNAPSHOT</version> <packaging>pom</packaging> <name>Amdatu</name> - <version>0.0.6-SNAPSHOT</version> <url>http://wwwm.amdatu.org/</url> <inceptionYear>2010</inceptionYear> <description>Amdatu is an application platform</description> @@ -594,129 +594,6 @@ <version>2.6</version> </plugin> - <!-- - Since the Felix dependency manager 3.0.0 is not yet available in online maven repositories, it must be - installed to the local maven repository. We use the maven-install-plugin to do so during build - --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-install-plugin</artifactId> - <inherited>false</inherited> - <executions> - <execution> - <id>install-felix-dependency-manager</id> - <phase>initialize</phase> - <goals> - <goal>install-file</goal> - </goals> - <configuration> - <file>${basedir}/src/main/resources/lib/org.apache.felix.dependencymanager-3.0.0-SNAPSHOT.jar</file> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.dependencymanager</artifactId> - <version>${org.apache.felix.dependencymanager.version}</version> - <packaging>jar</packaging> - </configuration> - </execution> - - <execution> - <id>install-commons-logging-osgi-adapter</id> - <phase>initialize</phase> - <goals> - <goal>install-file</goal> - </goals> - <configuration> - <file>${basedir}/src/main/resources/lib/commons-logging-osgi-20081215.jar</file> - <groupId>net.kornr.osgi</groupId> - <artifactId>commons-logging-osgi</artifactId> - <version>${net.kornr.osgi.commons-logging-osgi.version}</version> - <packaging>jar</packaging> - </configuration> - </execution> - - <execution> - <id>install-felix-dependency-manager-shell</id> - <phase>initialize</phase> - <goals> - <goal>install-file</goal> - </goals> - <configuration> - <file>${basedir}/src/main/resources/lib/org.apache.felix.dependencymanager.shell-3.0.0-SNAPSHOT.jar</file> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.dependencymanager.shell</artifactId> - <version>${org.apache.felix.dependencymanager.version}</version> - <packaging>jar</packaging> - </configuration> - </execution> - - <execution> - <id>install-pax-dependency-manager</id> - <phase>initialize</phase> - <goals> - <goal>install-file</goal> - </goals> - <configuration> - <file>${basedir}/src/main/resources/lib/pax-useradmin-service-0.0.1-SNAPSHOT.jar</file> - <groupId>org.ops4j.pax.useradmin</groupId> - <artifactId>pax-useradmin-service</artifactId> - <version>${pax.useradmin.version}</version> - <packaging>jar</packaging> - </configuration> - </execution> - </executions> - </plugin> - - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <inherited>false</inherited> - <executions> - <!-- Copy all system bundles --> - <execution> - <id>copy-system-runtime-bundles</id> - <phase>compile</phase> - <goals> - <goal>copy-dependencies</goal> - </goals> - <configuration> - <outputDirectory>${root.directory}/system-bundles</outputDirectory> - <excludeTransitive>true</excludeTransitive> - <includeScope>runtime</includeScope> - <includeGroupIds>org.apache.felix,org.ops4j.pax.web,org.ops4j.pax.useradmin,org.apache.sling</includeGroupIds> - </configuration> - </execution> - <execution> - <id>copy-system-provided-bundles</id> - <phase>compile</phase> - <goals> - <goal>copy-dependencies</goal> - </goals> - <configuration> - <outputDirectory>${root.directory}/system-bundles</outputDirectory> - <excludeTransitive>true</excludeTransitive> - <includeScope>provided</includeScope> - <includeGroupIds>org.apache.felix,org.ops4j.pax.web,org.apache.sling</includeGroupIds> - </configuration> - </execution> - - <!-- Copy all platform bundles --> - <execution> - <id>copy-platform-bundles</id> - <phase>package</phase> - <goals> - <goal>copy-dependencies</goal> - </goals> - <configuration> - <outputDirectory>${root.directory}/platform-bundles</outputDirectory> - <excludeTransitive>true</excludeTransitive> - <includeScope>provided</includeScope> - <includeGroupIds>org.amdatu.platform-bundles</includeGroupIds> - <excludeTypes>jar</excludeTypes> - </configuration> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> @@ -728,106 +605,6 @@ </configuration> </plugin> - <!-- Copy configuration files --> - <plugin> - <artifactId>maven-resources-plugin</artifactId> - <inherited>false</inherited> - <version>2.4.3</version> - <executions> - <execution> - <id>copy-conf</id> - <phase>install</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <outputDirectory>${conf.directory}</outputDirectory> - <resources> - <resource> - <directory>src/main/resources/conf</directory> - <filtering>true</filtering> - </resource> - </resources> - </configuration> - </execution> - <execution> - <id>copy-shell</id> - <phase>install</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <outputDirectory>${root.directory}</outputDirectory> - <resources> - <resource> - <directory>src/main/resources/shell</directory> - <filtering>true</filtering> - </resource> - </resources> - </configuration> - </execution> - <execution> - <id>copy-shortcuts</id> - <phase>install</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <outputDirectory>${root.directory}</outputDirectory> - <resources> - <resource> - <directory>src/main/resources/shortcuts</directory> - <filtering>true</filtering> - </resource> - </resources> - </configuration> - </execution> - <execution> - <id>copy-configs</id> - <phase>install</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <outputDirectory>${deploy.directory}</outputDirectory> - <resources> - <resource> - <directory>platform-bundles/cassandra-application/src/main/resources/conf</directory> - <filtering>true</filtering> - </resource> - <resource> - <directory>example-bundles/course-gadget/src/main/resources/conf</directory> - <filtering>true</filtering> - </resource> - <resource> - <directory>example-bundles/course-service/src/main/resources/conf</directory> - <filtering>true</filtering> - </resource> - <resource> - <directory>example-bundles/friends-gadget/src/main/resources/conf</directory> - <filtering>true</filtering> - </resource> - <resource> - <directory>gadget-bundles/login-gadget/src/main/resources/conf</directory> - <filtering>true</filtering> - </resource> - <resource> - <directory>gadget-bundles/sparqlendpoint-gadget/src/main/resources/conf</directory> - <filtering>true</filtering> - </resource> - <resource> - <directory>platform-bundles/loghandler/src/main/resources/conf</directory> - <filtering>true</filtering> - </resource> - <resource> - <directory>platform-bundles/config-template-manager/src/main/resources/conf</directory> - <filtering>true</filtering> - </resource> - </resources> - </configuration> - </execution> - </executions> - </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-site-plugin</artifactId>
