This is an automated email from the git hooks/post-receive script. tjaalton pushed a commit to branch master in repository jackson-jaxrs-providers.
commit 77c28fa2a04ae6d69d2740c8a6866f5e817385be Author: Tatu Saloranta <[email protected]> Date: Sat Apr 5 20:58:18 2014 -0700 Update to 2.4.0 --- base/pom.xml | 4 +--- cbor/pom.xml | 4 +--- json/pom.xml | 4 +--- pom.xml | 12 ++++++------ smile/pom.xml | 4 +--- .../fasterxml/jackson/jaxrs/smile/dw/ResourceTestBase.java | 1 - .../jackson/jaxrs/smile/dw/SimpleEndpointTestBase.java | 5 +---- xml/pom.xml | 4 +--- .../jackson/jaxrs/xml/dw/SimpleEndpointTestBase.java | 1 - 9 files changed, 12 insertions(+), 27 deletions(-) diff --git a/base/pom.xml b/base/pom.xml index d7ea57a..8698ff3 100644 --- a/base/pom.xml +++ b/base/pom.xml @@ -1,12 +1,10 @@ <?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/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> - <modelVersion>4.0.0</modelVersion> - <parent> <groupId>com.fasterxml.jackson.jaxrs</groupId> <artifactId>jackson-jaxrs-providers</artifactId> - <version>2.3.3-SNAPSHOT</version> + <version>2.4.0-SNAPSHOT</version> </parent> <artifactId>jackson-jaxrs-base</artifactId> <name>Jackson-JAXRS-base</name> diff --git a/cbor/pom.xml b/cbor/pom.xml index cd0b443..25da88f 100644 --- a/cbor/pom.xml +++ b/cbor/pom.xml @@ -1,12 +1,10 @@ <?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/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> - <modelVersion>4.0.0</modelVersion> - <parent> <groupId>com.fasterxml.jackson.jaxrs</groupId> <artifactId>jackson-jaxrs-providers</artifactId> - <version>2.3.3-SNAPSHOT</version> + <version>2.4.0-SNAPSHOT</version> </parent> <artifactId>jackson-jaxrs-cbor-provider</artifactId> <name>Jackson-JAXRS-CBOR</name> diff --git a/json/pom.xml b/json/pom.xml index 81effe2..3de9a40 100644 --- a/json/pom.xml +++ b/json/pom.xml @@ -1,12 +1,10 @@ <?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/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> - <modelVersion>4.0.0</modelVersion> - <parent> <groupId>com.fasterxml.jackson.jaxrs</groupId> <artifactId>jackson-jaxrs-providers</artifactId> - <version>2.3.3-SNAPSHOT</version> + <version>2.4.0-SNAPSHOT</version> </parent> <artifactId>jackson-jaxrs-json-provider</artifactId> <name>Jackson-JAXRS-JSON</name> diff --git a/pom.xml b/pom.xml index 91040c6..4390919 100644 --- a/pom.xml +++ b/pom.xml @@ -2,14 +2,14 @@ <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/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>com.fasterxml</groupId> - <artifactId>oss-parent</artifactId> - <version>12</version> + <groupId>com.fasterxml.jackson</groupId> + <artifactId>jackson-parent</artifactId> + <version>2.4</version> </parent> <groupId>com.fasterxml.jackson.jaxrs</groupId> <artifactId>jackson-jaxrs-providers</artifactId> <name>Jackson JAX-RS</name> - <version>2.3.3-SNAPSHOT</version> + <version>2.4.0-SNAPSHOT</version> <packaging>pom</packaging> <description>Parent for Jackson JAX-RS providers </description> @@ -30,9 +30,9 @@ </scm> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <version.jackson.annotations>2.3.0</version.jackson.annotations> + <version.jackson.annotations>2.4.0-SNAPSHOT</version.jackson.annotations> <!-- core/databind should have same version; data formats, annotations may differ --> - <version.jackson.core>2.3.2</version.jackson.core> + <version.jackson.core>2.4.0-SNAPSHOT</version.jackson.core> <version.jackson.cbor>${version.jackson.core}</version.jackson.cbor> <version.jackson.smile>${version.jackson.core}</version.jackson.smile> diff --git a/smile/pom.xml b/smile/pom.xml index 27ec25f..bc099db 100644 --- a/smile/pom.xml +++ b/smile/pom.xml @@ -1,12 +1,10 @@ <?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/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> - <modelVersion>4.0.0</modelVersion> - <parent> <groupId>com.fasterxml.jackson.jaxrs</groupId> <artifactId>jackson-jaxrs-providers</artifactId> - <version>2.3.3-SNAPSHOT</version> + <version>2.4.0-SNAPSHOT</version> </parent> <artifactId>jackson-jaxrs-smile-provider</artifactId> <name>Jackson-JAXRS-Smile</name> diff --git a/smile/src/test/java/com/fasterxml/jackson/jaxrs/smile/dw/ResourceTestBase.java b/smile/src/test/java/com/fasterxml/jackson/jaxrs/smile/dw/ResourceTestBase.java index 5100483..5a0c537 100644 --- a/smile/src/test/java/com/fasterxml/jackson/jaxrs/smile/dw/ResourceTestBase.java +++ b/smile/src/test/java/com/fasterxml/jackson/jaxrs/smile/dw/ResourceTestBase.java @@ -1,6 +1,5 @@ package com.fasterxml.jackson.jaxrs.smile.dw; -import java.io.*; import java.util.HashSet; import java.util.Set; diff --git a/smile/src/test/java/com/fasterxml/jackson/jaxrs/smile/dw/SimpleEndpointTestBase.java b/smile/src/test/java/com/fasterxml/jackson/jaxrs/smile/dw/SimpleEndpointTestBase.java index 4df493b..a2b448e 100644 --- a/smile/src/test/java/com/fasterxml/jackson/jaxrs/smile/dw/SimpleEndpointTestBase.java +++ b/smile/src/test/java/com/fasterxml/jackson/jaxrs/smile/dw/SimpleEndpointTestBase.java @@ -3,10 +3,7 @@ package com.fasterxml.jackson.jaxrs.smile.dw; import java.io.*; import java.net.*; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import javax.ws.rs.*; import org.eclipse.jetty.server.Server; import org.junit.Assert; diff --git a/xml/pom.xml b/xml/pom.xml index 1f080a1..95efb35 100644 --- a/xml/pom.xml +++ b/xml/pom.xml @@ -1,12 +1,10 @@ <?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/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> - <modelVersion>4.0.0</modelVersion> - <parent> <groupId>com.fasterxml.jackson.jaxrs</groupId> <artifactId>jackson-jaxrs-providers</artifactId> - <version>2.3.3-SNAPSHOT</version> + <version>2.4.0-SNAPSHOT</version> </parent> <artifactId>jackson-jaxrs-xml-provider</artifactId> <name>Jackson-JAXRS-XML</name> diff --git a/xml/src/test/java/com/fasterxml/jackson/jaxrs/xml/dw/SimpleEndpointTestBase.java b/xml/src/test/java/com/fasterxml/jackson/jaxrs/xml/dw/SimpleEndpointTestBase.java index 2eefa2b..fe048be 100644 --- a/xml/src/test/java/com/fasterxml/jackson/jaxrs/xml/dw/SimpleEndpointTestBase.java +++ b/xml/src/test/java/com/fasterxml/jackson/jaxrs/xml/dw/SimpleEndpointTestBase.java @@ -13,7 +13,6 @@ import org.junit.Assert; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.dataformat.xml.XmlMapper; -import com.sun.jersey.core.header.MediaTypes; public abstract class SimpleEndpointTestBase extends ResourceTestBase { -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jackson-jaxrs-providers.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
