knut/album
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of ssh://forkalsrud.org/home/gitroot/album

Browse source
This commit is contained in:
Knut Forkalsrud 2010-07-05 12:41:41 -07:00
commit b0b7e7c625
1 changed files with 49 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
pom.xml
View file

@ -3,7 +3,7 @@
<groupId>org.forkalsrud</groupId> <groupId>org.forkalsrud</groupId>
<artifactId>album</artifactId> <artifactId>album</artifactId>
<packaging>war</packaging> <packaging>war</packaging>
<version>0.19-SNAPSHOT</version> <version>0.20-SNAPSHOT</version>
<name>Photo Album</name> <name>Photo Album</name>
<url>http://forkalsrud.org:8080/</url> <url>http://forkalsrud.org:8080/</url>
<developers> <developers>
@ -26,9 +26,9 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties> </properties>
<scm> <scm>
<url>forkalsrud.org</url> <url>forkalsrud.org</url>
<developerConnection>scm:git:ssh://forkalsrud.org/home/gitroot/album</developerConnection> <developerConnection>scm:git:ssh://forkalsrud.org/home/gitroot/album.git</developerConnection>
<connection>scm:git:ssh://forkalsrud.org/home/gitroot/album</connection> <connection>scm:git:ssh://forkalsrud.org/home/gitroot/album.git</connection>
</scm> </scm>
<build> <build>
<finalName>photo</finalName> <finalName>photo</finalName>
@ -97,6 +97,12 @@
<artifactId>velocity-tools</artifactId> <artifactId>velocity-tools</artifactId>
<version>2.0-beta3</version> <version>2.0-beta3</version>
<scope>runtime</scope> <scope>runtime</scope>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.drewnoakes</groupId> <groupId>com.drewnoakes</groupId>
@ -118,6 +124,7 @@
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
<version>4.7</version> <version>4.7</version>
<scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.sleepycat</groupId> <groupId>com.sleepycat</groupId>
@ -127,9 +134,39 @@
<!-- <!--
<dependency><groupId>com.caucho</groupId><artifactId>resin</artifactId><version>3.1.8</version></dependency> <dependency><groupId>com.caucho</groupId><artifactId>resin</artifactId><version>3.1.8</version></dependency>
--> -->
<dependency><groupId>org.springframework</groupId><artifactId>spring-webmvc</artifactId><version>3.0.0.RELEASE</version></dependency> <dependency>
<dependency><groupId>org.springframework</groupId><artifactId>spring-context</artifactId><version>3.0.0.RELEASE</version></dependency> <groupId>org.springframework</groupId>
<dependency><groupId>org.springframework</groupId><artifactId>spring-orm</artifactId><version>3.0.0.RELEASE</version></dependency> <artifactId>spring-webmvc</artifactId>
<version>3.0.0.RELEASE</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>3.0.0.RELEASE</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-orm</artifactId>
<version>3.0.0.RELEASE</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency> <dependency>
<groupId>org.apache.lucene</groupId> <groupId>org.apache.lucene</groupId>
<artifactId>lucene-core</artifactId> <artifactId>lucene-core</artifactId>
@ -150,6 +187,11 @@
<artifactId>jul-to-slf4j</artifactId> <artifactId>jul-to-slf4j</artifactId>
<version>1.5.10</version> <version>1.5.10</version>
</dependency> </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>1.5.10</version>
</dependency>
</dependencies> </dependencies>
<repositories> <repositories>
<repository> <repository>