Author: aadamchik
Date: Mon Nov 18 19:56:53 2013
New Revision: 1543129
URL: http://svn.apache.org/r1543129
Log:
another attempt to make hsql dep optional
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=1543129&r1=1543128&r2=1543129&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-client/pom.xml (original)
+++ cayenne/main/trunk/cayenne-client/pom.xml Mon Nov 18 19:56:53 2013
@@ -69,11 +69,6 @@
<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=1543129&r1=1543128&r2=1543129&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-lifecycle/pom.xml (original)
+++ cayenne/main/trunk/cayenne-lifecycle/pom.xml Mon Nov 18 19:56:53 2013
@@ -53,11 +53,6 @@
<artifactId>mockito-all</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<plugins>
Modified: cayenne/main/trunk/cayenne-server/pom.xml
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/pom.xml?rev=1543129&r1=1543128&r2=1543129&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/pom.xml (original)
+++ cayenne/main/trunk/cayenne-server/pom.xml Mon Nov 18 19:56:53 2013
@@ -137,11 +137,6 @@
<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=1543129&r1=1543128&r2=1543129&view=diff
==============================================================================
--- cayenne/main/trunk/pom.xml (original)
+++ cayenne/main/trunk/pom.xml Mon Nov 18 19:56:53 2013
@@ -854,6 +854,44 @@
</plugins>
</build>
</profile>
+
+ <!-- DB profiles ..
+ HSQL is used if no DB profile property is set
explicitly.
+ Also there's a separate 'hsql' profile.
+ -->
+ <profile>
+ <id>default-db</id>
+ <activation>
+ <property>
+ <name>!cayenneTestConnection</name>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <version>1.8.0.4</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>hsql</id>
+ <activation>
+ <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>
