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

update jackson to 2.x

Browse source
This commit is contained in:
Erik Forkalsrud 2014-08-28 00:22:41 -07:00
parent abcba30131
commit 3bd0a9518a
2 changed files with 4 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
pom.xml
View file

@ -201,13 +201,11 @@
<groupId>commons-io</groupId> <groupId>commons-io</groupId>
<artifactId>commons-io</artifactId> <artifactId>commons-io</artifactId>
<version>1.4</version> <version>1.4</version>
<type>jar</type>
<scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.codehaus.jackson</groupId> <groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-mapper-asl</artifactId> <artifactId>jackson-databind</artifactId>
<version>1.9.13</version> <version>2.4.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
@ -222,44 +220,6 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
<!-- repositories>
<repository>
<id>central</id>
<name>forkalsrud.org maven proxy</name>
<releases><enabled>true</enabled></releases>
<snapshots><enabled>false</enabled></snapshots>
<url>http://forkalsrud.org:8080/nexus/content/groups/public</url>
</repository>
<repository>
<id>snapshots</id>
<name>forkalsrud.org maven proxy</name>
<releases><enabled>false</enabled></releases>
<snapshots><enabled>true</enabled></snapshots>
<url>http://forkalsrud.org:8080/nexus/content/groups/public-snapshots</url>
</repository>
<repository>
<id>oracleReleases</id>
<name>Oracle Released Java Packages</name>
<url>http://download.oracle.com/maven</url>
<layout>default</layout>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>central</id>
<name>forkalsrud.org maven proxy</name>
<releases><enabled>true</enabled></releases>
<snapshots><enabled>false</enabled></snapshots>
<url>http://forkalsrud.org:8080/nexus/content/groups/public</url>
</pluginRepository>
<pluginRepository>
<id>snapshots</id>
<name>forkalsrud.org maven proxy</name>
<releases><enabled>false</enabled></releases>
<snapshots><enabled>true</enabled></snapshots>
<url>http://forkalsrud.org:8080/nexus/content/groups/public-snapshots</url>
</pluginRepository>
</pluginRepositories -->
<distributionManagement> <distributionManagement>
<!-- use the following if you're not using a snapshot version. --> <!-- use the following if you're not using a snapshot version. -->
<repository> <repository>

2
src/main/java/org/forkalsrud/album/video/MovieCoder.java
View file

@ -14,7 +14,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import org.apache.commons.io.IOUtils; import org.apache.commons.io.IOUtils;
import org.codehaus.jackson.map.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import org.forkalsrud.album.db.Chunk; import org.forkalsrud.album.db.Chunk;
import org.forkalsrud.album.db.MovieDatabase; import org.forkalsrud.album.db.MovieDatabase;
import org.forkalsrud.album.exif.Dimension; import org.forkalsrud.album.exif.Dimension;