Skip to content

Commit

Permalink
update dependencies to add additional direct dependencies on various …
Browse files Browse the repository at this point in the history 
…apache commons libraries, spring-beans; removed need for junit, xercesImpl, xml-apis, stax-api and tested on 1.5 and 1.6
  • Loading branch information
knaas committed Mar 15, 2008
1 parent 450e7c8 commit 59e36b6
Show file tree
Hide file tree
Showing 2 changed files with 98 additions and 10 deletions.
103 changes: 96 additions & 7 deletions symmetric/pom.xml
View file
Expand Up @@ -157,7 +157,9 @@
<docbook.source>${basedir}/src/docbook</docbook.source>
<docbook.target>${basedir}/target/site/guide</docbook.target>
</properties>

<build>

<finalName>symmetric-ds</finalName>
<plugins>
<plugin>
Expand All @@ -174,6 +176,14 @@
</archive>
</configuration>
</plugin>
<plugin>
<artifactId>maven-eclipse-plugin</artifactId>
<configuration>
<wtpVersion>${wtpVersion}</wtpVersion>
<downloadSources>true</downloadSources>
<downloadJavadocs>true</downloadJavadocs>
</configuration>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
Expand Down Expand Up @@ -477,16 +487,21 @@
<artifactId>spring-core</artifactId>
<version>${springframework-release-version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>${springframework-release-version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
<version>${springframework-release-version}</version>
</dependency>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>${springframework-release-version}</version>
</dependency>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
Expand All @@ -496,17 +511,44 @@
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>${springframework-release-version}</version>
</dependency>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
<version>${springframework-release-version}</version>
</dependency>
</dependency>
<!-- DDLUtils -->
<dependency>
<groupId>org.apache.ddlutils</groupId>
<artifactId>ddlutils</artifactId>
<version>1.0</version>
<exclusions>
<exclusion>
<!-- not needed -->
<groupId>commons-logging</groupId>
<artifactId>commons-logging-api</artifactId>
</exclusion>
<exclusion>
<!-- this is a mistake in ddlutils dependencies -->
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</exclusion>
<exclusion>
<!-- not needed -->
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
</exclusion>
<exclusion>
<!-- not needed -->
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
</exclusion>
<exclusion>
<!-- not needed -->
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- J2EE -->
<dependency>
Expand All @@ -522,6 +564,11 @@
<artifactId>commons-io</artifactId>
<version>1.3.2</version>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>3.2</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
Expand All @@ -542,6 +589,33 @@
<artifactId>commons-cli</artifactId>
<version>1.1</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.3</version>
</dependency>
<dependency>
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
<version>1.2.1</version>
<exclusions>
<exclusion>
<!-- not needed -->
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
</exclusion>
<exclusion>
<!-- not needed -->
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>commons-math</groupId>
<artifactId>commons-math</artifactId>
<version>1.1</version>
</dependency>
<!-- Should the jetty stuff be split to another project: symmetric-jetty? -->
<dependency>
<groupId>org.mortbay.jetty</groupId>
Expand Down Expand Up @@ -603,12 +677,27 @@
<artifactId>hsqldb</artifactId>
<version>1.8.0.7</version>
</dependency>
<!-- Examples: should the examples be pushed to a separate project? It isn't used at compile or runtime except for a single example in the user guide. -->
<dependency>
<!-- Examples: should the examples be pushed to a separate project? It isn't used at compile or runtime except for a single example in the user guide.
<dependency>
<groupId>net.sourceforge.javawebparts</groupId>
<artifactId>javawebparts-filter</artifactId>
<version>1.0-beta4</version>
<optional>true</optional>
</dependency>
</dependency>-->
</dependencies>

<!--
<profiles>
<profile>
<id>jdk15</id>
<activation>
<jdk>1.5</jdk>
</activation>
<dependencies>
<dependency></dependency>
</dependencies>
</profile>
</profiles>-->

</project>
5 changes: 2 additions & 3 deletions symmetric/src/test/java/org/jumpmind/symmetric/MultiDatabaseTestFactory.java
View file
Expand Up @@ -30,22 +30,21 @@
import java.util.Properties;
import java.util.Set;

import junit.framework.Assert;

import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.jumpmind.symmetric.common.TestConstants;
import org.jumpmind.symmetric.db.DbTriggerTest;
import org.jumpmind.symmetric.load.DataLoaderTest;
import org.testng.annotations.Factory;
import org.testng.Assert;

/**
* Run this test to run all the tests against all the configured databases.
*/
public class MultiDatabaseTestFactory {

static final Log logger = LogFactory.getLog(MultiDatabaseTestFactory.class);
private static final Log logger = LogFactory.getLog(MultiDatabaseTestFactory.class);

enum DatabaseRole {
CLIENT, ROOT
Expand Down

0 comments on commit 59e36b6

Please sign in to comment.