Author: aadamchik
Date: Sat Nov 16 21:24:04 2013
New Revision: 1542590
URL: http://svn.apache.org/r1542590
Log:
CAY-1883 - Clean up Cayenne maven structure - get rid of aggregate modules
* cleanup, being explicit about the scope of
various dependencies
Modified:
cayenne/main/trunk/cayenne-core/pom.xml
Modified: cayenne/main/trunk/cayenne-core/pom.xml
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-core/pom.xml?rev=1542590&r1=1542589&r2=1542590&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-core/pom.xml (original)
+++ cayenne/main/trunk/cayenne-core/pom.xml Sat Nov 16 21:24:04 2013
@@ -22,63 +22,82 @@
<description>Cayenne Core</description>
<packaging>jar</packaging>
<dependencies>
+
+ <!-- Compile dependencies -->
<dependency>
<groupId>org.apache.cayenne</groupId>
<artifactId>cayenne-di</artifactId>
<version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>com.caucho</groupId>
- <artifactId>resin-hessian</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </dependency>
- <dependency>
- <groupId>jgroups</groupId>
- <artifactId>jgroups-all</artifactId>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-dbcp</groupId>
- <artifactId>commons-dbcp</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-pool</groupId>
- <artifactId>commons-pool</artifactId>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
+ <scope>compile</scope>
</dependency>
+
+ <!-- Optional dependencies... things that might have been
placed in submodules... -->
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
+ <groupId>com.caucho</groupId>
+ <artifactId>resin-hessian</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>jgroups</groupId>
+ <artifactId>jgroups-all</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>jivesoftware</groupId>
<artifactId>smack</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>jivesoftware</groupId>
<artifactId>smackx</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>opensymphony</groupId>
<artifactId>oscache</artifactId>
+ <optional>true</optional>
</dependency>
-
<dependency>
<groupId>net.sf.ehcache</groupId>
<artifactId>ehcache-core</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ <optional>true</optional>
+ </dependency>
+
+ <!-- Provided Dependencies (those coming from environment) -->
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_1.1_spec</artifactId>
+ <scope>provided</scope>
</dependency>
<!-- Test dependencies -->
