[seam-commits] Seam SVN: r8155 - in trunk: seam-gen and 1 other directory.
Author: jbalunas(a)redhat.com
Date: 2008-05-11 22:27:49 -0400 (Sun, 11 May 2008)
New Revision: 8155
Modified:
trunk/build/core.pom.xml
trunk/build/gen.pom.xml
trunk/build/root.pom.xml
trunk/seam-gen/build.xml
Log:
JBSEAM-2592, JBSEAM-2482, JBSEAM-2961 - these changes make concurrent.jar and hsqldb.jar
part of seam's distribution by making them optional core dependencies. Changes were
also needed to make seam-gen use hsqldb.jar in its new location.
Modified: trunk/build/core.pom.xml
===================================================================
--- trunk/build/core.pom.xml 2008-05-12 02:02:40 UTC (rev 8154)
+++ trunk/build/core.pom.xml 2008-05-12 02:27:49 UTC (rev 8155)
@@ -288,7 +288,19 @@
<optional>true</optional>
<scope>runtime</scope>
</dependency>
+
+ <dependency>
+ <groupId>oswego-concurrent</groupId>
+ <artifactId>concurrent</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <optional>true</optional>
+ </dependency>
+
</dependencies>
</project>
Modified: trunk/build/gen.pom.xml
===================================================================
--- trunk/build/gen.pom.xml 2008-05-12 02:02:40 UTC (rev 8154)
+++ trunk/build/gen.pom.xml 2008-05-12 02:27:49 UTC (rev 8155)
@@ -34,15 +34,15 @@
</dependency>
<dependency>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam</artifactId>
<scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
Modified: trunk/build/root.pom.xml
===================================================================
--- trunk/build/root.pom.xml 2008-05-12 02:02:40 UTC (rev 8154)
+++ trunk/build/root.pom.xml 2008-05-12 02:27:49 UTC (rev 8155)
@@ -976,6 +976,12 @@
</dependency>
<dependency>
+ <groupId>oswego-concurrent</groupId>
+ <artifactId>concurrent</artifactId>
+ <version>1.3.4</version>
+ </dependency>
+
+ <dependency>
<groupId>hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>1.8.0.2</version>
Modified: trunk/seam-gen/build.xml
===================================================================
--- trunk/seam-gen/build.xml 2008-05-12 02:02:40 UTC (rev 8154)
+++ trunk/seam-gen/build.xml 2008-05-12 02:27:49 UTC (rev 8155)
@@ -368,7 +368,7 @@
message="Enter the Hibernate dialect for your database
[${hibernate.dialect.default}]"
defaultvalue="${hibernate.dialect.default}"/>
- <property name="old.driver.jar"
value="../lib/gen/hsqldb.jar"/>
+ <property name="old.driver.jar"
value="../lib/hsqldb.jar"/>
<input addproperty="driver.jar.new"
message="Enter the filesystem path to the JDBC driver jar
[${old.driver.jar}]"
defaultvalue="${old.driver.jar}"/>