Author: aadamchik
Date: Sat Nov 16 21:23:50 2013
New Revision: 1542589
URL: http://svn.apache.org/r1542589
Log:
CAY-1883 - Clean up Cayenne maven structure - get rid of aggregate modules
* no more direct dependencies on hsqldb (only included in the test profile)
* aligning derby dep versions
Modified:
cayenne/main/trunk/cayenne-core/pom.xml
cayenne/main/trunk/cayenne-lifecycle/pom.xml
cayenne/main/trunk/docs/doc/pom.xml
cayenne/main/trunk/pom.xml
cayenne/main/trunk/tutorials/tutorial/pom.xml
Modified: cayenne/main/trunk/cayenne-core/pom.xml
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-core/pom.xml?rev=1542589&r1=1542588&r2=1542589&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-core/pom.xml (original)
+++ cayenne/main/trunk/cayenne-core/pom.xml Sat Nov 16 21:23:50 2013
@@ -56,11 +56,6 @@
<artifactId>commons-pool</artifactId>
</dependency>
<dependency>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
</dependency>
Modified: cayenne/main/trunk/cayenne-lifecycle/pom.xml
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-lifecycle/pom.xml?rev=1542589&r1=1542588&r2=1542589&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-lifecycle/pom.xml (original)
+++ cayenne/main/trunk/cayenne-lifecycle/pom.xml Sat Nov 16 21:23:50 2013
@@ -49,11 +49,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.apache.cayenne.buildtools</groupId>
<artifactId>cayenne-legal</artifactId>
<version>${project.version}</version>
Modified: cayenne/main/trunk/docs/doc/pom.xml
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/pom.xml?rev=1542589&r1=1542588&r2=1542589&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/pom.xml (original)
+++ cayenne/main/trunk/docs/doc/pom.xml Sat Nov 16 21:23:50 2013
@@ -90,11 +90,6 @@
</dependency>
<dependency>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- </dependency>
-
- <dependency>
<groupId>jgoodies</groupId>
<artifactId>forms</artifactId>
</dependency>
Modified: cayenne/main/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/pom.xml?rev=1542589&r1=1542588&r2=1542589&view=diff
==============================================================================
--- cayenne/main/trunk/pom.xml (original)
+++ cayenne/main/trunk/pom.xml Sat Nov 16 21:23:50 2013
@@ -310,17 +310,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <version>1.8.0.4</version>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>10.7.1.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>com.caucho</groupId>
<artifactId>resin-hessian</artifactId>
<version>3.1.6</version>
@@ -870,6 +859,14 @@
<value>internal_embedded_datasource</value>
</property>
</activation>
+ <dependencies>
+ <dependency>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <version>1.8.0.4</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
</profile>
<profile>
<id>firebird</id>
Modified: cayenne/main/trunk/tutorials/tutorial/pom.xml
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/tutorials/tutorial/pom.xml?rev=1542589&r1=1542588&r2=1542589&view=diff
==============================================================================
--- cayenne/main/trunk/tutorials/tutorial/pom.xml (original)
+++ cayenne/main/trunk/tutorials/tutorial/pom.xml Sat Nov 16 21:23:50 2013
@@ -29,7 +29,7 @@
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
- <version>10.5.3.0_1</version>
+ <version>10.7.1.1</version>
</dependency>
</dependencies>
