Author: [email protected]
Date: Thu Apr 14 18:16:33 2011
New Revision: 975
Log:
AMDATU-117 decoupled web module from reactor pom
Modified:
trunk/amdatu-web/jsp/pom.xml
trunk/amdatu-web/pom.xml
trunk/amdatu-web/resource/pom.xml
Modified: trunk/amdatu-web/jsp/pom.xml
==============================================================================
--- trunk/amdatu-web/jsp/pom.xml (original)
+++ trunk/amdatu-web/jsp/pom.xml Thu Apr 14 18:16:33 2011
@@ -18,9 +18,16 @@
<groupId>org.amdatu.web</groupId>
<artifactId>httpcontext</artifactId>
<scope>provided</scope>
+ <version>${project.version}</version>
<type>bundle</type>
</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.apache.tomcat</groupId>
<artifactId>jasper</artifactId>
<version>6.0.29</version>
Modified: trunk/amdatu-web/pom.xml
==============================================================================
--- trunk/amdatu-web/pom.xml (original)
+++ trunk/amdatu-web/pom.xml Thu Apr 14 18:16:33 2011
@@ -1,43 +1,33 @@
<?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";>
+<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.2.0-SNAPSHOT</version>
+ <relativePath>../amdatu-parent/pom.xml</relativePath>
</parent>
<artifactId>org.amdatu.web</artifactId>
<name>Amdatu Web</name>
<description>This module consists of all Web related bundles</description>
<packaging>pom</packaging>
+ <properties>
+ <pax.swissbox.version>1.3.0</pax.swissbox.version>
+ </properties>
+
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.amdatu.web</groupId>
- <artifactId>httpcontext</artifactId>
- <version>${project.version}</version>
+ <groupId>org.ops4j.pax.swissbox</groupId>
+ <artifactId>pax-swissbox-core</artifactId>
+ <version>${pax.swissbox.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>dispatcher</module>
<module>tenantresolver-hostname</module>
Modified: trunk/amdatu-web/resource/pom.xml
==============================================================================
--- trunk/amdatu-web/resource/pom.xml (original)
+++ trunk/amdatu-web/resource/pom.xml Thu Apr 14 18:16:33 2011
@@ -16,6 +16,7 @@
<dependency>
<groupId>org.amdatu.web</groupId>
<artifactId>httpcontext</artifactId>
+ <version>${project.version}</version>
<scope>provided</scope>
<type>bundle</type>
</dependency>
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
