You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@empire-db.apache.org by fr...@apache.org on 2010/11/01 23:56:02 UTC
svn commit: r1029879 - in /incubator/empire-db/trunk: ./ empire-db-codegen/
empire-db-examples/empire-db-example-struts2/src/main/java/org/apache/empire/struts2/websample/web/
empire-db-maven-plugin/ empire-db-struts2/ empire-db/
Author: francisdb
Date: Mon Nov 1 22:56:01 2010
New Revision: 1029879
URL: http://svn.apache.org/viewvc?rev=1029879&view=rev
Log:
EMPIREDB-85 Remove declarations of unused dependencies (from pom.xml)
Modified:
incubator/empire-db/trunk/empire-db-codegen/pom.xml
incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/java/org/apache/empire/struts2/websample/web/SampleApplication.java
incubator/empire-db/trunk/empire-db-maven-plugin/pom.xml
incubator/empire-db/trunk/empire-db-struts2/pom.xml
incubator/empire-db/trunk/empire-db/pom.xml
incubator/empire-db/trunk/pom.xml
Modified: incubator/empire-db/trunk/empire-db-codegen/pom.xml
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-codegen/pom.xml?rev=1029879&r1=1029878&r2=1029879&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-codegen/pom.xml (original)
+++ incubator/empire-db/trunk/empire-db-codegen/pom.xml Mon Nov 1 22:56:01 2010
@@ -45,7 +45,7 @@
<dependency>
<groupId>hsqldb</groupId>
<artifactId>hsqldb</artifactId>
- <!-- <scope>runtime</scope> -->
+ <scope>test</scope>
</dependency>
<!-- mysql -->
Modified: incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/java/org/apache/empire/struts2/websample/web/SampleApplication.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/java/org/apache/empire/struts2/websample/web/SampleApplication.java?rev=1029879&r1=1029878&r2=1029879&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/java/org/apache/empire/struts2/websample/web/SampleApplication.java (original)
+++ incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/java/org/apache/empire/struts2/websample/web/SampleApplication.java Mon Nov 1 22:56:01 2010
@@ -215,7 +215,8 @@ public class SampleApplication implement
script.run(driver, conn, false);
db.commit(conn);
// Open again
- if (!db.isOpen() && !db.open(driver, conn)){
+ if (!db.isOpen() && !db.open(driver, conn))
+ {
throw new RuntimeException(driver.getErrorMessage());
}
// Insert Sample Departments
Modified: incubator/empire-db/trunk/empire-db-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-maven-plugin/pom.xml?rev=1029879&r1=1029878&r2=1029879&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-maven-plugin/pom.xml (original)
+++ incubator/empire-db/trunk/empire-db-maven-plugin/pom.xml Mon Nov 1 22:56:01 2010
@@ -32,14 +32,23 @@
<artifactId>empire-db-codegen</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.empire-db</groupId>
+ <artifactId>empire-db</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>2.0</version>
</dependency>
- <dependency>
+ <!-- <dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<version>2.0</version>
+ </dependency> -->
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ <version>2.0</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
Modified: incubator/empire-db/trunk/empire-db-struts2/pom.xml
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-struts2/pom.xml?rev=1029879&r1=1029878&r2=1029879&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-struts2/pom.xml (original)
+++ incubator/empire-db/trunk/empire-db-struts2/pom.xml Mon Nov 1 22:56:01 2010
@@ -39,10 +39,15 @@
<groupId>org.apache.struts</groupId>
<artifactId>struts2-portlet-plugin</artifactId>
</dependency>
- <dependency>
+ <dependency>
+ <groupId>org.apache.struts.xwork</groupId>
+ <artifactId>xwork-core</artifactId>
+ <!-- <version>2.2.1</version> -->
+ </dependency>
+ <!-- <dependency>
<groupId>javassist</groupId>
<artifactId>javassist</artifactId>
- </dependency>
+ </dependency> -->
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
@@ -55,5 +60,10 @@
<groupId>javax.portlet</groupId>
<artifactId>portlet-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ </dependency>
+
</dependencies>
</project>
\ No newline at end of file
Modified: incubator/empire-db/trunk/empire-db/pom.xml
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db/pom.xml?rev=1029879&r1=1029878&r2=1029879&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db/pom.xml (original)
+++ incubator/empire-db/trunk/empire-db/pom.xml Mon Nov 1 22:56:01 2010
@@ -31,10 +31,10 @@
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
</dependency>
- <dependency>
+ <!--<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
- </dependency>
+ </dependency>-->
<!-- TODO we should get rid of this dependency -->
<dependency>
<groupId>log4j</groupId>
@@ -55,4 +55,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: incubator/empire-db/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/pom.xml?rev=1029879&r1=1029878&r2=1029879&view=diff
==============================================================================
--- incubator/empire-db/trunk/pom.xml (original)
+++ incubator/empire-db/trunk/pom.xml Mon Nov 1 22:56:01 2010
@@ -231,11 +231,6 @@
<version>1.7.0</version>
</dependency>
<dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.2.1</version>
- </dependency>
- <dependency>
<groupId>hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>1.8.0.10</version>
@@ -249,13 +244,13 @@
<groupId>org.apache.struts</groupId>
<artifactId>struts2-portlet-plugin</artifactId>
<version>2.2.1</version>
- </dependency>
- <dependency>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- <version>3.8.0.GA</version>
</dependency>
<dependency>
+ <groupId>org.apache.struts.xwork</groupId>
+ <artifactId>xwork-core</artifactId>
+ <version>2.2.1</version>
+ </dependency>
+ <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.4</version>