| pom.xml | pom.xml | |||
|---|---|---|---|---|
| <?xml version="1.0" encoding="UTF-8"?> | <?xml version="1.0" encoding="UTF-8"?> | |||
| <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/P OM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> | <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/P OM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> | |||
| <modelVersion>4.0.0</modelVersion> | <modelVersion>4.0.0</modelVersion> | |||
| <parent> | <parent> | |||
| <groupId>io.dropwizard</groupId> | <groupId>io.dropwizard</groupId> | |||
| <artifactId>dropwizard-parent</artifactId> | <artifactId>dropwizard-parent</artifactId> | |||
| <version>0.7.1</version> | <version>0.8.0</version> | |||
| </parent> | </parent> | |||
| <artifactId>dropwizard-hibernate</artifactId> | <artifactId>dropwizard-hibernate</artifactId> | |||
| <name>Dropwizard Hibernate Support</name> | <name>Dropwizard Hibernate Support</name> | |||
| <dependencies> | <dependencies> | |||
| <dependency> | <dependency> | |||
| <groupId>io.dropwizard</groupId> | <groupId>io.dropwizard</groupId> | |||
| <artifactId>dropwizard-db</artifactId> | <artifactId>dropwizard-db</artifactId> | |||
| <version>${project.version}</version> | <version>${project.version}</version> | |||
| <exclusions> | ||||
| <exclusion> | ||||
| <groupId>junit</groupId> | ||||
| <artifactId>junit</artifactId> | ||||
| </exclusion> | ||||
| </exclusions> | ||||
| </dependency> | </dependency> | |||
| <dependency> | <dependency> | |||
| <groupId>com.fasterxml.jackson.datatype</groupId> | <groupId>com.fasterxml.jackson.datatype</groupId> | |||
| <artifactId>jackson-datatype-hibernate4</artifactId> | <artifactId>jackson-datatype-hibernate4</artifactId> | |||
| <version>${jackson.version}</version> | <version>${jackson.version}</version> | |||
| <exclusions> | ||||
| <exclusion> | ||||
| <groupId>com.fasterxml.jackson.core</groupId> | ||||
| <artifactId>jackson-databind</artifactId> | ||||
| </exclusion> | ||||
| </exclusions> | ||||
| </dependency> | </dependency> | |||
| <dependency> | <dependency> | |||
| <groupId>org.jadira.usertype</groupId> | <groupId>org.jadira.usertype</groupId> | |||
| <artifactId>usertype.core</artifactId> | <artifactId>usertype.core</artifactId> | |||
| <version>3.0.0.GA</version> | <version>3.2.0.GA</version> | |||
| <exclusions> | <exclusions> | |||
| <exclusion> | <exclusion> | |||
| <groupId>org.hibernate</groupId> | <groupId>org.hibernate</groupId> | |||
| <artifactId>hibernate-entitymanager</artifactId> | <artifactId>hibernate-entitymanager</artifactId> | |||
| </exclusion> | </exclusion> | |||
| <exclusion> | <exclusion> | |||
| <groupId>org.slf4j</groupId> | <groupId>org.slf4j</groupId> | |||
| <artifactId>slf4j-api</artifactId> | <artifactId>slf4j-api</artifactId> | |||
| </exclusion> | </exclusion> | |||
| <exclusion> | <exclusion> | |||
| skipping to change at line 63 | skipping to change at line 75 | |||
| </exclusions> | </exclusions> | |||
| </dependency> | </dependency> | |||
| <!-- we need HSQL because it handles time zones, H2 totally doesn't --> | <!-- we need HSQL because it handles time zones, H2 totally doesn't --> | |||
| <dependency> | <dependency> | |||
| <groupId>org.hsqldb</groupId> | <groupId>org.hsqldb</groupId> | |||
| <artifactId>hsqldb</artifactId> | <artifactId>hsqldb</artifactId> | |||
| <version>2.3.2</version> | <version>2.3.2</version> | |||
| <scope>test</scope> | <scope>test</scope> | |||
| </dependency> | </dependency> | |||
| <dependency> | <dependency> | |||
| <groupId>com.sun.jersey.jersey-test-framework</groupId> | <groupId>org.glassfish.jersey.test-framework.providers</groupId | |||
| <artifactId>jersey-test-framework-core</artifactId> | > | |||
| <version>${jersey.version}</version> | <artifactId>jersey-test-framework-provider-inmemory</artifactId | |||
| <scope>test</scope> | > | |||
| <exclusions> | ||||
| <exclusion> | ||||
| <groupId>junit</groupId> | ||||
| <artifactId>junit</artifactId> | ||||
| </exclusion> | ||||
| </exclusions> | ||||
| </dependency> | ||||
| <dependency> | ||||
| <groupId>com.sun.jersey.jersey-test-framework</groupId> | ||||
| <artifactId>jersey-test-framework-inmemory</artifactId> | ||||
| <version>${jersey.version}</version> | <version>${jersey.version}</version> | |||
| <scope>test</scope> | <scope>test</scope> | |||
| <exclusions> | ||||
| <exclusion> | ||||
| <groupId>junit</groupId> | ||||
| <artifactId>junit</artifactId> | ||||
| </exclusion> | ||||
| </exclusions> | ||||
| </dependency> | </dependency> | |||
| </dependencies> | </dependencies> | |||
| </project> | </project> | |||
| End of changes. 6 change blocks. | ||||
| 22 lines changed or deleted | 18 lines changed or added | |||
This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/ | ||||