[Tynstep-svn] r184 - trunk/step-parent
ChrisBurrell at crosswire.org
ChrisBurrell at crosswire.org
Sun Nov 7 10:21:57 MST 2010
Author: ChrisBurrell
Date: 2010-11-07 10:21:57 -0700 (Sun, 07 Nov 2010)
New Revision: 184
Modified:
trunk/step-parent/pom.xml
Log:
Modified: trunk/step-parent/pom.xml
===================================================================
--- trunk/step-parent/pom.xml 2010-11-07 17:20:00 UTC (rev 183)
+++ trunk/step-parent/pom.xml 2010-11-07 17:21:57 UTC (rev 184)
@@ -1,39 +1,42 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>com.tyndalehouse</groupId>
+ <groupId>com.tyndalehouse.step</groupId>
<artifactId>step-parent</artifactId>
<packaging>pom</packaging>
- <version>0.1-SNAPSHOT</version>
- <name>STEP :: Parent project</name>
+ <version>1.0-SNAPSHOT</version>
+ <name>STEP :: Parent Maven project</name>
<properties>
<project.build.sourceEncoding>iso-8859-1</project.build.sourceEncoding>
<project.reporting.outputEncoding>iso-8859-1</project.reporting.outputEncoding>
<java.version>1.5</java.version>
-
+
<db.directory>${user.home}/TyndaleStep/StepDB</db.directory>
<db.driver>org.apache.derby.jdbc.EmbeddedDriver</db.driver>
<db.connection.string>jdbc:derby:${db.directory}</db.connection.string>
- <gwt.version>2.1.0.M2</gwt.version>
<derby.version>10.5.3.0_1</derby.version>
- <mvp4g.version>1.2.0-SNAPSHOT</mvp4g.version>
-
+ <junit.version>4.8.2</junit.version>
<jsword.version>1.6.1-SNAPSHOT</jsword.version>
- <gin.version>1.0</gin.version>
- <guice.version>2.0</guice.version>
- <guice-servlet.version>2.0</guice-servlet.version>
- <gwt-log.version>3.0.1</gwt-log.version>
- <gwt-dispatch.version>1.0.0</gwt-dispatch.version>
- <gxt.version>2.1.1</gxt.version>
- <commons-configuration.version>1.6</commons-configuration.version>
+
+ <org.springframework.version>3.0.5.RELEASE</org.springframework.version>
+ <jackson-mapper-asl.version>1.5.3</jackson-mapper-asl.version>
+ <org.slf4j.version>1.6.1</org.slf4j.version>
+ <servlet-api.version>2.5</servlet-api.version>
+ <jsp-api.version>2.1</jsp-api.version>
+ <jstl.version>1.2</jstl.version>
+
+ <!-- Commons -->
+ <commons-beanutils.version>1.8.3</commons-beanutils.version>
<commons-lang.version>2.5</commons-lang.version>
- <commons-logging.version>1.1.1</commons-logging.version>
+
+
+ <commons-configuration.version>1.6</commons-configuration.version>
+
<commons-dbcp.version>1.3</commons-dbcp.version>
<commons-io.version>1.4</commons-io.version>
<commons-dbutils.version>1.3</commons-dbutils.version>
- <commons-lang.version>2.5</commons-lang.version>
<jmock.version>2.5.1</jmock.version>
<opencsv.version>2.1</opencsv.version>
<mockito.version>1.8.5</mockito.version>
@@ -45,27 +48,15 @@
<url>https://crosswire.org/svn/tynstep/trunk/</url>
</scm>
- <repositories>
- <repository>
- <id>mvp4g repository</id>
- <url>https://mvp4g.googlecode.com/svn/maven2/snapshots/</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>gwt repository</id>
- <url>https://google-web-toolkit.googlecode.com/svn/2.1.0.M2/gwt/maven</url>
- </repository>
- <repository>
- <id>jboss repository</id>
- <url>http://repository.jboss.org/maven2</url>
- </repository>
- </repositories>
-
<dependencyManagement>
<dependencies>
<dependency>
+ <groupId>com.tyndalehouse.step</groupId>
+ <artifactId>step-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.crosswire</groupId>
<artifactId>jsword</artifactId>
<version>${jsword.version}</version>
@@ -76,80 +67,88 @@
<version>${jsword.version}</version>
</dependency>
+ <!-- Spring dependencies -->
<dependency>
- <groupId>com.tyndalehouse</groupId>
- <artifactId>step-web-shared</artifactId>
- <version>${project.version}</version>
- </dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>${org.springframework.version}</version>
+ <exclusions>
+ <!-- Exclude Commons Logging in favor of SLF4j -->
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
- <groupId>com.tyndalehouse</groupId>
- <artifactId>step-web-server</artifactId>
- <version>${project.version}</version>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-webmvc</artifactId>
+ <version>${org.springframework.version}</version>
</dependency>
<dependency>
- <groupId>com.google.gwt</groupId>
- <artifactId>gwt-servlet</artifactId>
- <version>${gwt.version}</version>
- <scope>compile</scope>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-mapper-asl</artifactId>
+ <version>${jackson-mapper-asl.version}</version>
</dependency>
- <dependency>
- <groupId>com.google.gwt</groupId>
- <artifactId>gwt-user</artifactId>
- <version>${gwt.version}</version>
- <scope>provided</scope>
- </dependency>
+ <!-- Logging -->
<dependency>
- <groupId>com.google.gwt</groupId>
- <artifactId>gwt-dev</artifactId>
- <version>${gwt.version}</version>
- <scope>provided</scope>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${org.slf4j.version}</version>
</dependency>
-
<dependency>
- <groupId>com.googlecode.gwt.inject</groupId>
- <artifactId>gin</artifactId>
- <version>${gin.version}</version>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>${org.slf4j.version}</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
- <groupId>com.google.inject</groupId>
- <artifactId>guice</artifactId>
- <version>${guice.version}</version>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${org.slf4j.version}</version>
+ <scope>runtime</scope>
</dependency>
+ <!-- Servlet -->
<dependency>
- <groupId>com.google.inject.extensions</groupId>
- <artifactId>guice-servlet</artifactId>
- <version>${guice-servlet.version}</version>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>${servlet-api.version}</version>
+ <scope>provided</scope>
</dependency>
-
<dependency>
- <groupId>net.customware.gwt.dispatch</groupId>
- <artifactId>gwt-dispatch</artifactId>
- <version>${gwt-dispatch.version}</version>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>${jsp-api.version}</version>
+ <scope>provided</scope>
</dependency>
-
<dependency>
- <groupId>com.google.code.gwt-log</groupId>
- <artifactId>gwt-log</artifactId>
- <version>${gwt-log.version}</version>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ <version>${jstl.version}</version>
</dependency>
<dependency>
- <groupId>com.extjs</groupId>
- <artifactId>gxt</artifactId>
- <version>${gxt.version}</version>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <version>${commons-beanutils.version}</version>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>${commons-logging.version}</version>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>${commons-lang.version}</version>
</dependency>
+
+ <!-- probably unnecessary for now <dependency> <groupId>org.tuckey</groupId>
+ <artifactId>urlrewritefilter</artifactId> <version>3.1.0</version> </dependency> -->
+
+
<dependency>
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
@@ -168,17 +167,12 @@
<version>${commons-dbutils.version}</version>
</dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>${commons-lang.version}</version>
- </dependency>
<dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <version>${mockito.version}</version>
- <scope>test</scope>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <version>${mockito.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
@@ -222,9 +216,9 @@
</dependency>
<dependency>
- <groupId>com.googlecode.mvp4g</groupId>
- <artifactId>mvp4g</artifactId>
- <version>${mvp4g.version}</version>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
@@ -265,7 +259,7 @@
<artifactId>exec-maven-plugin</artifactId>
<version>1.1.1</version>
</plugin>
-
+
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
@@ -276,7 +270,8 @@
<artifactId>maven-eclipse-plugin</artifactId>
<configuration>
<downloadSources>true</downloadSources>
- <downloadJavadocs>true</downloadJavadocs>
+ <downloadJavadocs>false</downloadJavadocs>
+ <wtpversion>2.0</wtpversion>
<additionalProjectnatures>
<projectnature>com.google.gwt.eclipse.core.gwtNature</projectnature>
@@ -322,7 +317,7 @@
</configuration>
<dependencies>
<dependency>
- <groupId>com.tyndalehouse</groupId>
+ <groupId>com.tyndalehouse.step</groupId>
<artifactId>step-build</artifactId>
<version>${project.version}</version>
</dependency>
@@ -344,7 +339,6 @@
</check>
</configuration>
</plugin>
-
</plugins>
</pluginManagement>
</build>
More information about the Tynstep-svn
mailing list