Author: aadamchik
Date: Sun Nov 17 17:16:21 2013
New Revision: 1542764
URL: http://svn.apache.org/r1542764
Log:
adding hsql to the test scope
otheriwse hsqldb profile may not be activated if say 'assembly' is active
and the tests will fail
Modified:
cayenne/main/trunk/cayenne-client/pom.xml
cayenne/main/trunk/cayenne-lifecycle/pom.xml
cayenne/main/trunk/cayenne-server/pom.xml
cayenne/main/trunk/pom.xml
Modified: cayenne/main/trunk/cayenne-client/pom.xml
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-client/pom.xml?rev=1542764&r1=1542763&r2=1542764&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-client/pom.xml (original)
+++ cayenne/main/trunk/cayenne-client/pom.xml Sun Nov 17 17:16:21 2013
@@ -69,6 +69,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.cayenne</groupId>
<artifactId>cayenne-server</artifactId>
<version>${project.version}</version>
Modified: cayenne/main/trunk/cayenne-lifecycle/pom.xml
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-lifecycle/pom.xml?rev=1542764&r1=1542763&r2=1542764&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-lifecycle/pom.xml (original)
+++ cayenne/main/trunk/cayenne-lifecycle/pom.xml Sun Nov 17 17:16:21 2013
@@ -28,9 +28,19 @@
<name>Cayenne Lifecycle Utilities</name>
<packaging>jar</packaging>
<dependencies>
+
+ <!-- Compile dependencies -->
+ <dependency>
+ <groupId>org.apache.cayenne</groupId>
+ <artifactId>cayenne-server</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <!-- Test dependencies -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.cayenne.build-tools</groupId>
@@ -41,11 +51,12 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.cayenne</groupId>
- <artifactId>cayenne-server</artifactId>
- <version>${project.version}</version>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
<build>
Modified: cayenne/main/trunk/cayenne-server/pom.xml
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/pom.xml?rev=1542764&r1=1542763&r2=1542764&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/pom.xml (original)
+++ cayenne/main/trunk/cayenne-server/pom.xml Sun Nov 17 17:16:21 2013
@@ -129,6 +129,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>mockrunner</groupId>
<artifactId>mockrunner</artifactId>
<scope>test</scope>
Modified: cayenne/main/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/pom.xml?rev=1542764&r1=1542763&r2=1542764&view=diff
==============================================================================
--- cayenne/main/trunk/pom.xml (original)
+++ cayenne/main/trunk/pom.xml Sun Nov 17 17:16:21 2013
@@ -461,6 +461,12 @@
<version>2.4.3</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <version>1.8.0.4</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</dependencyManagement>
@@ -830,26 +836,6 @@
</plugins>
</build>
</profile>
-
- <!-- Test DB Profiles (default is embedded HSQLDB) -->
- <profile>
- <id>default-db</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- <property>
- <name>cayenneTestConnection</name>
- <value>hsql</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>
<activation>
