Author: bdekruijff at gmail.com
Date: Thu Nov 11 19:57:23 2010
New Revision: 412
Log:
AMDATU-138 Moved dependencies out of root pom into level 1 projects
Modified:
trunk/amdatu-authorization/login-gadget/pom.xml
trunk/amdatu-authorization/pom.xml
trunk/amdatu-core/pom.xml
trunk/amdatu-example/pom.xml
trunk/amdatu-opensocial/pom.xml
trunk/amdatu-semanticweb/pom.xml
trunk/amdatu-web/httpcontext/pom.xml
trunk/amdatu-web/pom.xml
trunk/integration-tests/pom.xml
trunk/pom.xml
Modified: trunk/amdatu-authorization/login-gadget/pom.xml
==============================================================================
--- trunk/amdatu-authorization/login-gadget/pom.xml (original)
+++ trunk/amdatu-authorization/login-gadget/pom.xml Thu Nov 11 19:57:23 2010
@@ -12,40 +12,40 @@
<packaging>bundle</packaging>
<name>Amdatu Authorization - Login gadget</name>
<description>Provides a login gadget</description>
-
- <dependencies>
+
+ <dependencies>
<dependency>
<groupId>org.amdatu.web</groupId>
<artifactId>httpcontext</artifactId>
- <scope>provided</scope>
+ <scope>provided</scope>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.authorization.login</groupId>
<artifactId>service</artifactId>
- <scope>provided</scope>
+ <scope>provided</scope>
<type>bundle</type>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.amdatu.opensocial</groupId>
- <artifactId>shindig</artifactId>
+ <artifactId>shindig</artifactId>
<scope>provided</scope>
<type>bundle</type>
- </dependency>
- <dependency>
+ </dependency>
+ <dependency>
<groupId>org.amdatu.opensocial</groupId>
- <artifactId>gadgetmanagement</artifactId>
+ <artifactId>gadgetmanagement</artifactId>
<scope>provided</scope>
<type>bundle</type>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>20090211</version>
<scope>compile</scope>
- </dependency>
- </dependencies>
-
+ </dependency>
+ </dependencies>
+
<build>
<plugins>
<plugin>
@@ -60,9 +60,9 @@
</instructions>
</configuration>
</plugin>
-
+
</plugins>
-
+
<resources>
<resource>
<directory>src/main/resources</directory>
@@ -78,6 +78,6 @@
<include>conf/*.*</include>
</includes>
</resource>
- </resources>
- </build>
+ </resources>
+ </build>
</project>
Modified: trunk/amdatu-authorization/pom.xml
==============================================================================
--- trunk/amdatu-authorization/pom.xml (original)
+++ trunk/amdatu-authorization/pom.xml Thu Nov 11 19:57:23 2010
@@ -12,6 +12,39 @@
<description>This module consists of all Authorization related
bundles</description>
<packaging>pom</packaging>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.amdatu.authorization.login</groupId>
+ <artifactId>service</artifactId>
+ <version>${platform.version}</version>
+ <scope>provided</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.web</groupId>
+ <artifactId>httpcontext</artifactId>
+ <version>${platform.version}</version>
+ <scope>provided</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.opensocial</groupId>
+ <artifactId>gadgetmanagement</artifactId>
+ <version>${platform.version}</version>
+ <scope>provided</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.opensocial</groupId>
+ <artifactId>shindig</artifactId>
+ <version>${platform.version}</version>
+ <scope>provided</scope>
+ <type>bundle</type>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<modules>
<module>login-gadget</module>
<module>login-service</module>
Modified: trunk/amdatu-core/pom.xml
==============================================================================
--- trunk/amdatu-core/pom.xml (original)
+++ trunk/amdatu-core/pom.xml Thu Nov 11 19:57:23 2010
@@ -12,7 +12,47 @@
<packaging>pom</packaging>
<name>Amdatu Platform</name>
<description>This module consists of all bundles that are part of the Amdatu
platform.</description>
-
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.amdatu.core.config</groupId>
+ <artifactId>templates</artifactId>
+ <version>${platform.version}</version>
+ <scope>provided</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.core.cassandra</groupId>
+ <artifactId>application</artifactId>
+ <version>${platform.version}</version>
+ <scope>provided</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.core.cassandra</groupId>
+ <artifactId>listener</artifactId>
+ <version>${platform.version}</version>
+ <scope>provided</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.core.cassandra</groupId>
+ <artifactId>persistencemanager</artifactId>
+ <version>${platform.version}</version>
+ <scope>provided</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.web</groupId>
+ <artifactId>httpcontext</artifactId>
+ <version>${platform.version}</version>
+ <scope>provided</scope>
+ <type>bundle</type>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<modules>
<module>cassandra-application</module>
<module>cassandra-listener</module>
@@ -23,5 +63,5 @@
<module>loghandler</module>
<module>tenant</module>
</modules>
-
+
</project>
\ No newline at end of file
Modified: trunk/amdatu-example/pom.xml
==============================================================================
--- trunk/amdatu-example/pom.xml (original)
+++ trunk/amdatu-example/pom.xml Thu Nov 11 19:57:23 2010
@@ -12,6 +12,88 @@
<description>This module holds several examples</description>
<packaging>pom</packaging>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.amdatu.web</groupId>
+ <artifactId>httpcontext</artifactId>
+ <version>${platform.version}</version>
+ <scope>provided</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.opensocial</groupId>
+ <artifactId>shindig</artifactId>
+ <version>${platform.version}</version>
+ <scope>provided</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.opensocial</groupId>
+ <artifactId>gadgetmanagement</artifactId>
+ <version>${platform.version}</version>
+ <scope>provided</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.core.cassandra</groupId>
+ <artifactId>application</artifactId>
+ <version>${platform.version}</version>
+ <scope>provided</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.core.cassandra</groupId>
+ <artifactId>listener</artifactId>
+ <version>${platform.version}</version>
+ <scope>provided</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.core.cassandra</groupId>
+ <artifactId>persistencemanager</artifactId>
+ <version>${platform.version}</version>
+ <scope>provided</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.core</groupId>
+ <artifactId>tenant</artifactId>
+ <version>${platform.version}</version>
+ <scope>provided</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.opensocial</groupId>
+ <artifactId>profile</artifactId>
+ <version>${platform.version}</version>
+ <scope>provided</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.semanticweb</groupId>
+ <artifactId>sesame</artifactId>
+ <version>${platform.version}</version>
+ <scope>provided</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.core.config</groupId>
+ <artifactId>templates</artifactId>
+ <version>${platform.version}</version>
+ <scope>provided</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.authorization.login</groupId>
+ <artifactId>service</artifactId>
+ <version>${platform.version}</version>
+ <scope>provided</scope>
+ <type>bundle</type>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<dependencies>
<dependency>
<groupId>org.amdatu.web</groupId>
Modified: trunk/amdatu-opensocial/pom.xml
==============================================================================
--- trunk/amdatu-opensocial/pom.xml (original)
+++ trunk/amdatu-opensocial/pom.xml Thu Nov 11 19:57:23 2010
@@ -12,6 +12,59 @@
<description>This module consists of all Open Social related
bundles</description>
<packaging>pom</packaging>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.amdatu.web</groupId>
+ <artifactId>httpcontext</artifactId>
+ <version>${platform.version}</version>
+ <scope>provided</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.authorization.login</groupId>
+ <artifactId>service</artifactId>
+ <version>${platform.version}</version>
+ <scope>provided</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.opensocial</groupId>
+ <artifactId>shindig</artifactId>
+ <version>${platform.version}</version>
+ <scope>provided</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.libraries</groupId>
+ <artifactId>utilities</artifactId>
+ <version>${platform.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.core.cassandra</groupId>
+ <artifactId>application</artifactId>
+ <version>${platform.version}</version>
+ <scope>provided</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.core.cassandra</groupId>
+ <artifactId>listener</artifactId>
+ <version>${platform.version}</version>
+ <scope>provided</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.core.cassandra</groupId>
+ <artifactId>persistencemanager</artifactId>
+ <version>${platform.version}</version>
+ <scope>provided</scope>
+ <type>bundle</type>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<modules>
<module>dashboard</module>
<module>gadgetmanagement</module>
Modified: trunk/amdatu-semanticweb/pom.xml
==============================================================================
--- trunk/amdatu-semanticweb/pom.xml (original)
+++ trunk/amdatu-semanticweb/pom.xml Thu Nov 11 19:57:23 2010
@@ -12,6 +12,39 @@
<description>This module consists of all Semantic Web related
bundles</description>
<packaging>pom</packaging>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.amdatu.web</groupId>
+ <artifactId>httpcontext</artifactId>
+ <version>${platform.version}</version>
+ <scope>provided</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.opensocial</groupId>
+ <artifactId>shindig</artifactId>
+ <version>${platform.version}</version>
+ <scope>provided</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.opensocial</groupId>
+ <artifactId>gadgetmanagement</artifactId>
+ <version>${platform.version}</version>
+ <scope>provided</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.semanticweb</groupId>
+ <artifactId>sesame</artifactId>
+ <version>${platform.version}</version>
+ <scope>provided</scope>
+ <type>bundle</type>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<modules>
<module>sesame</module>
<module>sparqlendpoint</module>
Modified: trunk/amdatu-web/httpcontext/pom.xml
==============================================================================
--- trunk/amdatu-web/httpcontext/pom.xml (original)
+++ trunk/amdatu-web/httpcontext/pom.xml Thu Nov 11 19:57:23 2010
@@ -12,26 +12,26 @@
<packaging>bundle</packaging>
<name>Amdatu Web - HTTP Context</name>
<description>Provides a HTTPContext implementation</description>
-
- <dependencies>
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <version>1.8.3</version>
+
+ <dependencies>
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <version>1.8.3</version>
<scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>com.springsource.org.apache.commons.logging</artifactId>
- <version>1.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+ <version>1.1.1</version>
<scope>compile</scope>
- </dependency>
- <dependency>
+ </dependency>
+ <dependency>
<groupId>net.kornr.osgi</groupId>
- <artifactId>commons-logging-osgi</artifactId>
+ <artifactId>commons-logging-osgi</artifactId>
<version>${net.kornr.osgi.commons-logging-osgi.version}</version>
<scope>compile</scope>
- </dependency>
+ </dependency>
</dependencies>
<build>
@@ -48,7 +48,7 @@
*;resolution:=optional,
org.osgi.service.useradmin,
org.amdatu.web.httpcontext
- </Import-Package>
+ </Import-Package>
<_exportcontents>
org.amdatu.web.httpcontext
</_exportcontents>
@@ -57,6 +57,6 @@
</plugin>
</plugins>
-
- </build>
+
+ </build>
</project>
Modified: trunk/amdatu-web/pom.xml
==============================================================================
--- trunk/amdatu-web/pom.xml (original)
+++ trunk/amdatu-web/pom.xml Thu Nov 11 19:57:23 2010
@@ -12,6 +12,33 @@
<description>This module consists of all Web related bundles</description>
<packaging>pom</packaging>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.amdatu.web</groupId>
+ <artifactId>httpcontext</artifactId>
+ <version>${platform.version}</version>
+ <scope>provided</scope>
+ <type>bundle</type>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.ops4j.pax.swissbox</groupId>
+ <artifactId>pax-swissbox-core</artifactId>
+ <version>${pax.swissbox.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.commons.mime</artifactId>
+ <version>${org.apache.sling.commons.mime.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
<modules>
<module>httpcontext</module>
<module>jsp</module>
Modified: trunk/integration-tests/pom.xml
==============================================================================
--- trunk/integration-tests/pom.xml (original)
+++ trunk/integration-tests/pom.xml Thu Nov 11 19:57:23 2010
@@ -13,10 +13,85 @@
<name>Amdatu Integration Tests</name>
<description>This bundle contains integration tests for the
project</description>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.amdatu.core</groupId>
+ <artifactId>tenant</artifactId>
+ <version>${platform.version}</version>
+ <scope>provided</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.core.config</groupId>
+ <artifactId>templates</artifactId>
+ <version>${platform.version}</version>
+ <scope>provided</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.core.config</groupId>
+ <artifactId>filebased</artifactId>
+ <version>${platform.version}</version>
+ <scope>provided</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.core.cassandra</groupId>
+ <artifactId>application</artifactId>
+ <version>${platform.version}</version>
+ <scope>provided</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.core.cassandra</groupId>
+ <artifactId>listener</artifactId>
+ <version>${platform.version}</version>
+ <scope>provided</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.core.cassandra</groupId>
+ <artifactId>persistencemanager</artifactId>
+ <version>${platform.version}</version>
+ <scope>provided</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.core.cassandra</groupId>
+ <artifactId>useradminstore</artifactId>
+ <version>${platform.version}</version>
+ <scope>provided</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.web</groupId>
+ <artifactId>httpcontext</artifactId>
+ <version>${platform.version}</version>
+ <scope>provided</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.web.rest</groupId>
+ <artifactId>wink</artifactId>
+ <version>${platform.version}</version>
+ <scope>provided</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.opensocial</groupId>
+ <artifactId>shindig</artifactId>
+ <version>${platform.version}</version>
+ <scope>provided</scope>
+ <type>bundle</type>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<dependencies>
<!-- Test scope dependencies -->
<!-- This is required to be first so that pax-exam classloader is not
messed up with a newer version of felix
- which would lead to java.lang.NoSuchMethodError:
org.apache.felix.framework.Logger.<init>(I)V -->
+ which would lead to java.lang.NoSuchMethodError:
org.apache.felix.framework.Logger.<init>(I)V -->
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam</artifactId>
@@ -34,7 +109,7 @@
<artifactId>pax-exam-container-default</artifactId>
<version>${pax.exam.version}</version>
<scope>test</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.ops4j.pax.swissbox</groupId>
<artifactId>pax-swissbox-core</artifactId>
@@ -71,19 +146,19 @@
<version>${platform.version}</version>
<scope>test</scope>
<type>bundle</type>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.amdatu.opensocial</groupId>
<artifactId>shindig</artifactId>
<scope>test</scope>
<type>bundle</type>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.amdatu.core</groupId>
<artifactId>tenant</artifactId>
<scope>test</scope>
<type>bundle</type>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.amdatu.core.cassandra</groupId>
<artifactId>application</artifactId>
@@ -96,7 +171,7 @@
<artifactId>persistencemanager</artifactId>
<scope>test</scope>
<type>bundle</type>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.amdatu.core.cassandra</groupId>
<artifactId>listener</artifactId>
@@ -124,7 +199,7 @@
</dependency>
<dependency>
<groupId>org.amdatu.web</groupId>
- <artifactId>jsp</artifactId>
+ <artifactId>jsp</artifactId>
<version>${platform.version}</version>
<scope>test</scope>
<type>bundle</type>
@@ -153,9 +228,73 @@
<artifactId>commons-codec</artifactId>
<version>1.4</version>
<scope>test</scope>
- </dependency>
+ </dependency>
+
+ <!--
+ AMDATU-138 added this list to get things to work
+ -->
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.framework</artifactId>
+ <version>${org.apache.felix.main.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.configadmin</artifactId>
+ <version>${org.apache.felix.configadmin.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.log</artifactId>
+ <version>${org.apache.felix.log.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.http.jetty</artifactId>
+ <version>${org.apache.felix.http.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.http.whiteboard</artifactId>
+ <version>${org.apache.felix.http.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.swissbox</groupId>
+ <artifactId>pax-swissbox-core</artifactId>
+ <version>${pax.swissbox.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.base</groupId>
+ <artifactId>ops4j-base-lang</artifactId>
+ <version>1.2.2</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.commons.mime</artifactId>
+ <version>${org.apache.sling.commons.mime.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.commons.osgi</artifactId>
+ <version>${org.apache.sling.commons.osgi.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.useradmin</groupId>
+ <artifactId>pax-useradmin-service</artifactId>
+ <version>${pax.useradmin.version}</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
-
+
<build>
<plugins>
@@ -169,7 +308,7 @@
</instructions>
</configuration>
</plugin>
-
+
<plugin>
<groupId>org.apache.servicemix.tooling</groupId>
<artifactId>depends-maven-plugin</artifactId>
@@ -183,8 +322,8 @@
</goals>
</execution>
</executions>
- </plugin>
-
+ </plugin>
+
<plugin>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>maven-paxexam-plugin</artifactId>
@@ -196,17 +335,17 @@
<goals>
<goal>generate-config</goal>
</goals>
- </execution>
+ </execution>
</executions>
<configuration>
<options>
<platform>${target-framework}</platform>
- </options>
+ </options>
</configuration>
</plugin>
-
+
<!-- Enable the surefire plugin only in the integration-test
- phase such that we can use Pax Exam for integration testing -->
+ phase such that we can use Pax Exam for integration testing -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
@@ -230,7 +369,7 @@
<skip>true</skip>
</configuration>
</plugin>
-
+
</plugins>
- </build>
+ </build>
</project>
Modified: trunk/pom.xml
==============================================================================
--- trunk/pom.xml (original)
+++ trunk/pom.xml Thu Nov 11 19:57:23 2010
@@ -251,169 +251,53 @@
-->
<dependencyManagement>
<dependencies>
- <!--
- Platform bundles (start level 5)
- -->
- <dependency>
- <groupId>org.amdatu.authorization.login</groupId>
- <artifactId>service</artifactId>
- <version>${platform.version}</version>
- <scope>provided</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.core.cassandra</groupId>
- <artifactId>application</artifactId>
- <version>${platform.version}</version>
- <scope>provided</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.core.cassandra</groupId>
- <artifactId>listener</artifactId>
- <version>${platform.version}</version>
- <scope>provided</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.core.cassandra</groupId>
- <artifactId>persistencemanager</artifactId>
- <version>${platform.version}</version>
- <scope>provided</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.libraries</groupId>
- <artifactId>utilities</artifactId>
- <version>${platform.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.amdatu.opensocial</groupId>
- <artifactId>gadgetmanagement</artifactId>
- <version>${platform.version}</version>
- <scope>provided</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.core.config</groupId>
- <artifactId>templates</artifactId>
- <version>${platform.version}</version>
- <scope>provided</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.web</groupId>
- <artifactId>httpcontext</artifactId>
- <version>${platform.version}</version>
- <scope>provided</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.opensocial</groupId>
- <artifactId>profile</artifactId>
- <version>${platform.version}</version>
- <scope>provided</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.semanticweb</groupId>
- <artifactId>sesame</artifactId>
- <version>${platform.version}</version>
- <scope>provided</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.core.config</groupId>
- <artifactId>filebased</artifactId>
- <version>${platform.version}</version>
- <scope>provided</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.opensocial</groupId>
- <artifactId>shindig</artifactId>
- <version>${platform.version}</version>
- <scope>provided</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.core</groupId>
- <artifactId>tenant</artifactId>
- <version>${platform.version}</version>
- <scope>provided</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.web.rest</groupId>
- <artifactId>wink</artifactId>
- <version>${platform.version}</version>
- <scope>provided</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.core.cassandra</groupId>
- <artifactId>useradminstore</artifactId>
- <version>${platform.version}</version>
- <scope>provided</scope>
- <type>bundle</type>
- </dependency>
+
<dependency>
- <groupId>org.apache.wink</groupId>
- <artifactId>wink-server</artifactId>
- <version>${org.apache.wink.version}</version>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>${org.osgi.version}</version>
<scope>provided</scope>
</dependency>
+
<dependency>
- <groupId>org.apache.wink</groupId>
- <artifactId>wink-common</artifactId>
- <version>${org.apache.wink.version}</version>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <version>${org.osgi.version}</version>
<scope>provided</scope>
</dependency>
+
<dependency>
- <groupId>javax.ws.rs</groupId>
- <artifactId>jsr311-api</artifactId>
- <version>${jsr311-api.version}</version>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.dependencymanager</artifactId>
+ <version>${org.apache.felix.dependencymanager.version}</version>
<scope>provided</scope>
</dependency>
+
<dependency>
<groupId>org.ops4j.pax.useradmin</groupId>
<artifactId>pax-useradmin-service</artifactId>
<version>${pax.useradmin.version}</version>
<scope>provided</scope>
</dependency>
+
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
+ <scope>test</scope>
</dependency>
+
<dependency>
<groupId>org.jmock</groupId>
<artifactId>jmock-junit4</artifactId>
<version>${jmock.version}</version>
+ <scope>test</scope>
</dependency>
+
</dependencies>
</dependencyManagement>
<dependencies>
- <!--
- This is required to be first so that pax-exam classloader is not messed
up with a newer version of felix which
- would lead to java.lang.NoSuchMethodError:
org.apache.felix.framework.Logger.<init>(I)V
- -->
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.framework</artifactId>
- <version>${org.apache.felix.main.version}</version>
- <scope>test</scope>
- </dependency>
-
- <!-- The main Felix framework -->
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.main</artifactId>
- <version>${org.apache.felix.main.version}</version>
- <scope>runtime</scope>
- </dependency>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -437,148 +321,22 @@
<dependency>
<groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.scr</artifactId>
- <version>${org.apache.felix.scr.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <!-- Event admin service -->
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.eventadmin</artifactId>
- <version>${org.apache.felix.eventadmin.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <!-- Configuration administration service -->
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.configadmin</artifactId>
- <version>${org.apache.felix.configadmin.version}</version>
- <scope>runtime</scope>
- </dependency>
-
- <!-- Log service bundle -->
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.log</artifactId>
- <version>${org.apache.felix.log.version}</version>
- <scope>runtime</scope>
- </dependency>
-
- <!-- File install bundle -->
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.fileinstall</artifactId>
- <version>${org.apache.felix.file.install.version}</version>
- <scope>runtime</scope>
- </dependency>
-
- <!-- Use Felix as HTTP service implementation -->
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.http.jetty</artifactId>
- <version>${org.apache.felix.http.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.http.whiteboard</artifactId>
- <version>${org.apache.felix.http.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <!-- Swissbox is used to resolve classloading issues in Jasper -->
- <dependency>
- <groupId>org.ops4j.pax.swissbox</groupId>
- <artifactId>pax-swissbox-core</artifactId>
- <version>${pax.swissbox.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.ops4j.base</groupId>
- <artifactId>ops4j-base-lang</artifactId>
- <version>1.2.2</version>
- <scope>provided</scope>
- </dependency>
-
- <!-- Include Apache Sling mimetype service -->
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.commons.mime</artifactId>
- <version>${org.apache.sling.commons.mime.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.commons.osgi</artifactId>
- <version>${org.apache.sling.commons.osgi.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <!-- Dependency manager -->
- <dependency>
- <groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.dependencymanager</artifactId>
- <version>${org.apache.felix.dependencymanager.version}</version>
<scope>provided</scope>
</dependency>
- <!-- The metatype service -->
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.metatype</artifactId>
- <version>${org.apache.felix.metatype.version}</version>
- <scope>runtime</scope>
- </dependency>
-
- <!-- Web Console -->
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.webconsole</artifactId>
- <version>${org.apache.felix.webconsole.version}</version>
- <scope>runtime</scope>
- </dependency>
-
- <!-- Enable this section to enable standard Felix shell -->
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.shell.tui</artifactId>
- <version>${org.apache.felix.shell.tui.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.shell</artifactId>
- <version>${org.apache.felix.shell.version}</version>
- <scope>runtime</scope>
- </dependency>
-
- <!-- Enable this section to enable the Gogo shell -->
- <!-- <dependency> <groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.gogo.runtime</artifactId>
<version>${org.apache.felix.gogo.version}</version>
- <scope>runtime</scope> </dependency> <dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.gogo.shell</artifactId>
- <version>${org.apache.felix.gogo.version}</version>
<scope>runtime</scope> </dependency> <dependency>
<groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.gogo.command</artifactId>
<version>${org.apache.felix.gogo.version}</version> <scope>runtime</scope>
- </dependency> -->
-
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>${junit.version}</version>
+ <scope>test</scope>
</dependency>
+
<dependency>
<groupId>org.jmock</groupId>
<artifactId>jmock-junit4</artifactId>
- <version>${jmock.version}</version>
+ <scope>test</scope>
</dependency>
- <!-- UserAdmin implementation -->
- <dependency>
- <groupId>org.ops4j.pax.useradmin</groupId>
- <artifactId>pax-useradmin-service</artifactId>
- <version>${pax.useradmin.version}</version>
- <scope>runtime</scope>
- </dependency>
</dependencies>
<modules>
