Author: bdekruijff at gmail.com Date: Fri Nov 5 16:21:01 2010 New Revision: 251
Log: AMDATU-138 Moving dependency installation workarounds to temporary buildsupport module Added: trunk/amdatu-buildsupport/ (props changed) trunk/amdatu-buildsupport/pom.xml trunk/amdatu-buildsupport/src/ trunk/amdatu-buildsupport/src/main/ trunk/amdatu-buildsupport/src/main/resources/ trunk/amdatu-buildsupport/src/main/resources/lib/ trunk/amdatu-buildsupport/src/main/resources/lib/commons-logging-osgi-20081215.jar (contents, props changed) trunk/amdatu-buildsupport/src/main/resources/lib/org.apache.felix.dependencymanager-3.0.0-SNAPSHOT.jar (contents, props changed) trunk/amdatu-buildsupport/src/main/resources/lib/org.apache.felix.dependencymanager.shell-3.0.0-SNAPSHOT.jar (contents, props changed) trunk/amdatu-buildsupport/src/main/resources/lib/pax-useradmin-service-0.0.1-SNAPSHOT.jar (contents, props changed) Removed: trunk/src/main/resources/lib/commons-logging-osgi-20081215.jar trunk/src/main/resources/lib/org.apache.felix.dependencymanager-3.0.0-SNAPSHOT.jar trunk/src/main/resources/lib/org.apache.felix.dependencymanager.shell-3.0.0-SNAPSHOT.jar trunk/src/main/resources/lib/pax-useradmin-service-0.0.1-SNAPSHOT.jar Modified: trunk/amdatu-web/ (props changed) trunk/amdatu-web/jsp-support-bundle/ (props changed) trunk/pom.xml Added: trunk/amdatu-buildsupport/pom.xml ============================================================================== --- (empty file) +++ trunk/amdatu-buildsupport/pom.xml Fri Nov 5 16:21:01 2010 @@ -0,0 +1,83 @@ +<?xml version="1.0" encoding="UTF-8"?> +<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</artifactId> + <version>0.0.6-SNAPSHOT</version> + </parent> + <artifactId>amdatu-buildsupport</artifactId> + <version>0.0.6-SNAPSHOT</version> + <packaging>pom</packaging> + <name>Amdatu Buildsupport</name> + <description>Workaround for local file installs. Will be replaced by AMdatu repository in the future.</description> + + <build> + <plugins> + <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-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-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-pax-useradmin</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> + </plugins> + </build> +</project> Added: trunk/amdatu-buildsupport/src/main/resources/lib/commons-logging-osgi-20081215.jar ============================================================================== Binary file. No diff available. Added: trunk/amdatu-buildsupport/src/main/resources/lib/org.apache.felix.dependencymanager-3.0.0-SNAPSHOT.jar ============================================================================== Binary file. No diff available. Added: trunk/amdatu-buildsupport/src/main/resources/lib/org.apache.felix.dependencymanager.shell-3.0.0-SNAPSHOT.jar ============================================================================== Binary file. No diff available. Added: trunk/amdatu-buildsupport/src/main/resources/lib/pax-useradmin-service-0.0.1-SNAPSHOT.jar ============================================================================== Binary file. No diff available. Modified: trunk/pom.xml ============================================================================== --- trunk/pom.xml (original) +++ trunk/pom.xml Fri Nov 5 16:21:01 2010 @@ -579,6 +579,7 @@ placed in the Amdatu Parent POM under pom/pom.xml. --> <modules> + <module>amdatu-buildsupport</module> <module>amdatu-release</module> <module>amdatu-web</module> <module>platform-bundles</module> @@ -684,77 +685,6 @@ </configuration> </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>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>
