[jackson-dataformat-smile] 10/31: Update to use 2.0.0-SNAPSHOT core package
Hilko Bengen
bengen at alioth.debian.org
Mon Sep 2 17:37:22 UTC 2013
This is an automated email from the git hooks/post-receive script.
bengen pushed a commit to annotated tag jackson-dataformat-smile-2.0.0
in repository jackson-dataformat-smile.
commit 2ebb8a0368a8cf725d1b27992d6a0fe9dad74ab9
Author: Tatu Saloranta <tsaloranta at gmail.com>
Date: Wed Dec 28 16:56:30 2011 -0800
Update to use 2.0.0-SNAPSHOT core package
---
pom.xml | 29 ++++++++++----------
.../jackson/dataformat/smile/SmileFactory.java | 8 +++---
.../jackson/dataformat/smile/SmileGenerator.java | 13 ++++-----
.../jackson/dataformat/smile/SmileParser.java | 12 ++++----
.../dataformat/smile/SmileParserBootstrapper.java | 13 ++++-----
.../fasterxml/jackson/dataformat/smile/Tool.java | 4 +--
.../jackson/dataformat/smile/SmileTestBase.java | 2 +-
.../dataformat/smile/TestGeneratorWithRawUtf8.java | 2 +-
.../smile/TestGeneratorWithSerializedString.java | 6 ++--
.../dataformat/smile/TestSmileDetection.java | 8 +++---
.../dataformat/smile/TestSmileDocBoundary.java | 2 +-
.../dataformat/smile/TestSmileFeatures.java | 2 +-
.../smile/TestSmileGeneratorBufferRecycle.java | 4 +--
.../smile/TestSmileGeneratorLongStrings.java | 2 +-
.../smile/TestSmileGeneratorSymbols.java | 2 +-
.../jackson/dataformat/smile/TestSmileParser.java | 4 +--
.../dataformat/smile/TestSmileParserBinary.java | 2 +-
.../dataformat/smile/TestSmileParserLocation.java | 4 +--
.../dataformat/smile/TestSmileParserNumbers.java | 3 +-
.../smile/TestSmileParserSymbolHandling.java | 6 ++--
20 files changed, 57 insertions(+), 71 deletions(-)
diff --git a/pom.xml b/pom.xml
index b35d345..7acbf6b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-dataformat-smile</artifactId>
<name>Jackson-dataformat-Smile</name>
- <version>1.9.2-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<description>Support for reading and writing Smile ("binary JSON") encoded data using Jackson abstractions (streaming API, data binding, tree model)
</description>
@@ -49,9 +49,9 @@
<dependencies>
<!-- Extends Jackson core -->
<dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-core-asl</artifactId>
- <version>1.9.2</version>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
</dependency>
<!-- and for testing, JUnit (or TestNG?) is needed -->
@@ -63,9 +63,9 @@
</dependency>
<!-- and tests also use data-binding -->
<dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
- <version>1.9.2</version>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -129,19 +129,20 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.4</version>
+ <version>2.3.6</version>
<extensions>true</extensions>
<configuration>
<instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Bundle-Vendor>fasterml.com</Bundle-Vendor>
<Import-Package>
-org.codehaus.jackson
-,org.codehaus.jackson.format
-,org.codehaus.jackson.impl
-,org.codehaus.jackson.io
-,org.codehaus.jackson.sym
-,org.codehaus.jackson.util
+com.fasterxml.jackson.core
+,com.fasterxml.jackson.core.base
+,com.fasterxml.jackson.core.format
+,com.fasterxml.jackson.core.io
+,com.fasterxml.jackson.core.json
+,com.fasterxml.jackson.core.sym
+,com.fasterxml.jackson.core.util
</Import-Package>
<Private-Package>
</Private-Package>
diff --git a/src/main/java/com/fasterxml/jackson/dataformat/smile/SmileFactory.java b/src/main/java/com/fasterxml/jackson/dataformat/smile/SmileFactory.java
index 3277750..a7c6ce7 100644
--- a/src/main/java/com/fasterxml/jackson/dataformat/smile/SmileFactory.java
+++ b/src/main/java/com/fasterxml/jackson/dataformat/smile/SmileFactory.java
@@ -3,10 +3,10 @@ package com.fasterxml.jackson.dataformat.smile;
import java.io.*;
import java.net.URL;
-import org.codehaus.jackson.*;
-import org.codehaus.jackson.format.InputAccessor;
-import org.codehaus.jackson.format.MatchStrength;
-import org.codehaus.jackson.io.IOContext;
+import com.fasterxml.jackson.core.*;
+import com.fasterxml.jackson.core.format.InputAccessor;
+import com.fasterxml.jackson.core.format.MatchStrength;
+import com.fasterxml.jackson.core.io.IOContext;
/**
* Factory used for constructing {@link SmileParser} and {@link SmileGenerator}
diff --git a/src/main/java/com/fasterxml/jackson/dataformat/smile/SmileGenerator.java b/src/main/java/com/fasterxml/jackson/dataformat/smile/SmileGenerator.java
index 7370a2a..2c4a078 100644
--- a/src/main/java/com/fasterxml/jackson/dataformat/smile/SmileGenerator.java
+++ b/src/main/java/com/fasterxml/jackson/dataformat/smile/SmileGenerator.java
@@ -6,11 +6,10 @@ import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.Arrays;
-import org.codehaus.jackson.*;
-import org.codehaus.jackson.io.IOContext;
-import org.codehaus.jackson.io.SerializedString;
-import org.codehaus.jackson.impl.JsonGeneratorBase;
-import org.codehaus.jackson.impl.JsonWriteContext;
+import com.fasterxml.jackson.core.*;
+import com.fasterxml.jackson.core.io.*;
+import com.fasterxml.jackson.core.json.JsonWriteContext;
+import com.fasterxml.jackson.core.base.GeneratorBase;
import static com.fasterxml.jackson.dataformat.smile.SmileConstants.*;
@@ -20,7 +19,7 @@ import static com.fasterxml.jackson.dataformat.smile.SmileConstants.*;
* @author tatu
*/
public class SmileGenerator
- extends JsonGeneratorBase
+ extends GeneratorBase
{
/**
* Enumeration that defines all togglable features for Smile generators.
@@ -432,7 +431,7 @@ public class SmileGenerator
/* Overridden methods, write methods
/**********************************************************
*/
-
+
/* And then methods overridden to make final, streamline some
* aspects...
*/
diff --git a/src/main/java/com/fasterxml/jackson/dataformat/smile/SmileParser.java b/src/main/java/com/fasterxml/jackson/dataformat/smile/SmileParser.java
index 5e495fd..3ba3332 100644
--- a/src/main/java/com/fasterxml/jackson/dataformat/smile/SmileParser.java
+++ b/src/main/java/com/fasterxml/jackson/dataformat/smile/SmileParser.java
@@ -10,14 +10,14 @@ import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.Arrays;
-import org.codehaus.jackson.*;
-import org.codehaus.jackson.impl.JsonParserBase;
-import org.codehaus.jackson.io.IOContext;
-import org.codehaus.jackson.sym.BytesToNameCanonicalizer;
-import org.codehaus.jackson.sym.Name;
+import com.fasterxml.jackson.core.*;
+import com.fasterxml.jackson.core.base.ParserBase;
+import com.fasterxml.jackson.core.io.IOContext;
+import com.fasterxml.jackson.core.sym.BytesToNameCanonicalizer;
+import com.fasterxml.jackson.core.sym.Name;
public class SmileParser
- extends JsonParserBase
+ extends ParserBase
{
/**
* Enumeration that defines all togglable features for Smile generators.
diff --git a/src/main/java/com/fasterxml/jackson/dataformat/smile/SmileParserBootstrapper.java b/src/main/java/com/fasterxml/jackson/dataformat/smile/SmileParserBootstrapper.java
index c12f643..5cfae84 100644
--- a/src/main/java/com/fasterxml/jackson/dataformat/smile/SmileParserBootstrapper.java
+++ b/src/main/java/com/fasterxml/jackson/dataformat/smile/SmileParserBootstrapper.java
@@ -2,14 +2,11 @@ package com.fasterxml.jackson.dataformat.smile;
import java.io.*;
-import org.codehaus.jackson.JsonLocation;
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.JsonParser;
-import org.codehaus.jackson.ObjectCodec;
-import org.codehaus.jackson.format.InputAccessor;
-import org.codehaus.jackson.format.MatchStrength;
-import org.codehaus.jackson.io.IOContext;
-import org.codehaus.jackson.sym.BytesToNameCanonicalizer;
+import com.fasterxml.jackson.core.*;
+import com.fasterxml.jackson.core.format.InputAccessor;
+import com.fasterxml.jackson.core.format.MatchStrength;
+import com.fasterxml.jackson.core.io.IOContext;
+import com.fasterxml.jackson.core.sym.BytesToNameCanonicalizer;
import static com.fasterxml.jackson.dataformat.smile.SmileConstants.*;
diff --git a/src/main/java/com/fasterxml/jackson/dataformat/smile/Tool.java b/src/main/java/com/fasterxml/jackson/dataformat/smile/Tool.java
index 441e19a..36438ed 100644
--- a/src/main/java/com/fasterxml/jackson/dataformat/smile/Tool.java
+++ b/src/main/java/com/fasterxml/jackson/dataformat/smile/Tool.java
@@ -2,7 +2,7 @@ package com.fasterxml.jackson.dataformat.smile;
import java.io.*;
-import org.codehaus.jackson.*;
+import com.fasterxml.jackson.core.*;
import com.fasterxml.jackson.dataformat.smile.SmileFactory;
@@ -12,8 +12,6 @@ import com.fasterxml.jackson.dataformat.smile.SmileFactory;
* option of either "-e" (encode) or "-d" (decode).
*
* @author tatu
- *
- * @since 1.6.2
*/
public class Tool
{
diff --git a/src/test/java/com/fasterxml/jackson/dataformat/smile/SmileTestBase.java b/src/test/java/com/fasterxml/jackson/dataformat/smile/SmileTestBase.java
index ed39a0d..a134b80 100644
--- a/src/test/java/com/fasterxml/jackson/dataformat/smile/SmileTestBase.java
+++ b/src/test/java/com/fasterxml/jackson/dataformat/smile/SmileTestBase.java
@@ -6,7 +6,7 @@ import java.util.Arrays;
import org.junit.Assert;
-import org.codehaus.jackson.*;
+import com.fasterxml.jackson.core.*;
import com.fasterxml.jackson.dataformat.smile.SmileFactory;
import com.fasterxml.jackson.dataformat.smile.SmileGenerator;
diff --git a/src/test/java/com/fasterxml/jackson/dataformat/smile/TestGeneratorWithRawUtf8.java b/src/test/java/com/fasterxml/jackson/dataformat/smile/TestGeneratorWithRawUtf8.java
index 12a7601..15576f5 100644
--- a/src/test/java/com/fasterxml/jackson/dataformat/smile/TestGeneratorWithRawUtf8.java
+++ b/src/test/java/com/fasterxml/jackson/dataformat/smile/TestGeneratorWithRawUtf8.java
@@ -7,7 +7,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Random;
-import org.codehaus.jackson.*;
+import com.fasterxml.jackson.core.*;
import com.fasterxml.jackson.dataformat.smile.SmileFactory;
import com.fasterxml.jackson.dataformat.smile.SmileGenerator;
diff --git a/src/test/java/com/fasterxml/jackson/dataformat/smile/TestGeneratorWithSerializedString.java b/src/test/java/com/fasterxml/jackson/dataformat/smile/TestGeneratorWithSerializedString.java
index d6806f6..0b8aebd 100644
--- a/src/test/java/com/fasterxml/jackson/dataformat/smile/TestGeneratorWithSerializedString.java
+++ b/src/test/java/com/fasterxml/jackson/dataformat/smile/TestGeneratorWithSerializedString.java
@@ -2,10 +2,8 @@ package com.fasterxml.jackson.dataformat.smile;
import java.io.ByteArrayOutputStream;
-import org.codehaus.jackson.JsonGenerator;
-import org.codehaus.jackson.JsonParser;
-import org.codehaus.jackson.JsonToken;
-import org.codehaus.jackson.io.SerializedString;
+import com.fasterxml.jackson.core.*;
+import com.fasterxml.jackson.core.io.SerializedString;
import com.fasterxml.jackson.dataformat.smile.SmileFactory;
diff --git a/src/test/java/com/fasterxml/jackson/dataformat/smile/TestSmileDetection.java b/src/test/java/com/fasterxml/jackson/dataformat/smile/TestSmileDetection.java
index 84e3bd7..af670ea 100644
--- a/src/test/java/com/fasterxml/jackson/dataformat/smile/TestSmileDetection.java
+++ b/src/test/java/com/fasterxml/jackson/dataformat/smile/TestSmileDetection.java
@@ -2,10 +2,10 @@ package com.fasterxml.jackson.dataformat.smile;
import java.io.*;
-import org.codehaus.jackson.*;
-import org.codehaus.jackson.format.DataFormatDetector;
-import org.codehaus.jackson.format.DataFormatMatcher;
-import org.codehaus.jackson.format.MatchStrength;
+import com.fasterxml.jackson.core.*;
+import com.fasterxml.jackson.core.format.DataFormatDetector;
+import com.fasterxml.jackson.core.format.DataFormatMatcher;
+import com.fasterxml.jackson.core.format.MatchStrength;
import com.fasterxml.jackson.dataformat.smile.SmileFactory;
import com.fasterxml.jackson.dataformat.smile.SmileParser;
diff --git a/src/test/java/com/fasterxml/jackson/dataformat/smile/TestSmileDocBoundary.java b/src/test/java/com/fasterxml/jackson/dataformat/smile/TestSmileDocBoundary.java
index 5d8c6cb..b24132d 100644
--- a/src/test/java/com/fasterxml/jackson/dataformat/smile/TestSmileDocBoundary.java
+++ b/src/test/java/com/fasterxml/jackson/dataformat/smile/TestSmileDocBoundary.java
@@ -2,7 +2,7 @@ package com.fasterxml.jackson.dataformat.smile;
import java.io.*;
-import org.codehaus.jackson.JsonToken;
+import com.fasterxml.jackson.core.JsonToken;
import com.fasterxml.jackson.dataformat.smile.SmileFactory;
import com.fasterxml.jackson.dataformat.smile.SmileGenerator;
diff --git a/src/test/java/com/fasterxml/jackson/dataformat/smile/TestSmileFeatures.java b/src/test/java/com/fasterxml/jackson/dataformat/smile/TestSmileFeatures.java
index 1f04f98..cc1a08a 100644
--- a/src/test/java/com/fasterxml/jackson/dataformat/smile/TestSmileFeatures.java
+++ b/src/test/java/com/fasterxml/jackson/dataformat/smile/TestSmileFeatures.java
@@ -1,6 +1,6 @@
package com.fasterxml.jackson.dataformat.smile;
-import org.codehaus.jackson.map.*;
+import com.fasterxml.jackson.databind.*;
import com.fasterxml.jackson.dataformat.smile.SmileFactory;
diff --git a/src/test/java/com/fasterxml/jackson/dataformat/smile/TestSmileGeneratorBufferRecycle.java b/src/test/java/com/fasterxml/jackson/dataformat/smile/TestSmileGeneratorBufferRecycle.java
index 1ab7fa7..f028d55 100644
--- a/src/test/java/com/fasterxml/jackson/dataformat/smile/TestSmileGeneratorBufferRecycle.java
+++ b/src/test/java/com/fasterxml/jackson/dataformat/smile/TestSmileGeneratorBufferRecycle.java
@@ -3,14 +3,12 @@ package com.fasterxml.jackson.dataformat.smile;
import java.io.*;
import java.util.*;
-import org.codehaus.jackson.*;
+import com.fasterxml.jackson.core.*;
import com.fasterxml.jackson.dataformat.smile.SmileFactory;
/* Test based on kimchy's issue (see https://gist.github.com/853232);
* exhibits an issue with buffer recycling.
- *
- * @since 1.8
*/
public class TestSmileGeneratorBufferRecycle extends SmileTestBase
{
diff --git a/src/test/java/com/fasterxml/jackson/dataformat/smile/TestSmileGeneratorLongStrings.java b/src/test/java/com/fasterxml/jackson/dataformat/smile/TestSmileGeneratorLongStrings.java
index 4a3fddd..b4f58ee 100644
--- a/src/test/java/com/fasterxml/jackson/dataformat/smile/TestSmileGeneratorLongStrings.java
+++ b/src/test/java/com/fasterxml/jackson/dataformat/smile/TestSmileGeneratorLongStrings.java
@@ -3,7 +3,7 @@ package com.fasterxml.jackson.dataformat.smile;
import java.io.*;
import java.util.*;
-import org.codehaus.jackson.*;
+import com.fasterxml.jackson.core.*;
import com.fasterxml.jackson.dataformat.smile.SmileFactory;
import com.fasterxml.jackson.dataformat.smile.SmileGenerator;
diff --git a/src/test/java/com/fasterxml/jackson/dataformat/smile/TestSmileGeneratorSymbols.java b/src/test/java/com/fasterxml/jackson/dataformat/smile/TestSmileGeneratorSymbols.java
index ebedd38..be06f0a 100644
--- a/src/test/java/com/fasterxml/jackson/dataformat/smile/TestSmileGeneratorSymbols.java
+++ b/src/test/java/com/fasterxml/jackson/dataformat/smile/TestSmileGeneratorSymbols.java
@@ -2,7 +2,7 @@ package com.fasterxml.jackson.dataformat.smile;
import java.io.ByteArrayOutputStream;
-import org.codehaus.jackson.*;
+import com.fasterxml.jackson.core.*;
import com.fasterxml.jackson.dataformat.smile.SmileFactory;
import com.fasterxml.jackson.dataformat.smile.SmileGenerator;
diff --git a/src/test/java/com/fasterxml/jackson/dataformat/smile/TestSmileParser.java b/src/test/java/com/fasterxml/jackson/dataformat/smile/TestSmileParser.java
index fc6a102..484e802 100644
--- a/src/test/java/com/fasterxml/jackson/dataformat/smile/TestSmileParser.java
+++ b/src/test/java/com/fasterxml/jackson/dataformat/smile/TestSmileParser.java
@@ -2,9 +2,7 @@ package com.fasterxml.jackson.dataformat.smile;
import java.io.*;
-import org.codehaus.jackson.JsonGenerator;
-import org.codehaus.jackson.JsonParser;
-import org.codehaus.jackson.JsonToken;
+import com.fasterxml.jackson.core.*;
import com.fasterxml.jackson.dataformat.smile.SmileConstants;
import com.fasterxml.jackson.dataformat.smile.SmileFactory;
diff --git a/src/test/java/com/fasterxml/jackson/dataformat/smile/TestSmileParserBinary.java b/src/test/java/com/fasterxml/jackson/dataformat/smile/TestSmileParserBinary.java
index 99a2ff2..76518c8 100644
--- a/src/test/java/com/fasterxml/jackson/dataformat/smile/TestSmileParserBinary.java
+++ b/src/test/java/com/fasterxml/jackson/dataformat/smile/TestSmileParserBinary.java
@@ -4,7 +4,7 @@ import java.io.*;
import static org.junit.Assert.*;
-import org.codehaus.jackson.JsonToken;
+import com.fasterxml.jackson.core.JsonToken;
import com.fasterxml.jackson.dataformat.smile.SmileFactory;
import com.fasterxml.jackson.dataformat.smile.SmileGenerator;
diff --git a/src/test/java/com/fasterxml/jackson/dataformat/smile/TestSmileParserLocation.java b/src/test/java/com/fasterxml/jackson/dataformat/smile/TestSmileParserLocation.java
index e8a3eec..d7e1c0f 100644
--- a/src/test/java/com/fasterxml/jackson/dataformat/smile/TestSmileParserLocation.java
+++ b/src/test/java/com/fasterxml/jackson/dataformat/smile/TestSmileParserLocation.java
@@ -2,9 +2,7 @@ package com.fasterxml.jackson.dataformat.smile;
import java.io.IOException;
-import org.codehaus.jackson.JsonLocation;
-import org.codehaus.jackson.JsonParser;
-import org.codehaus.jackson.JsonToken;
+import com.fasterxml.jackson.core.*;
public class TestSmileParserLocation
extends SmileTestBase
diff --git a/src/test/java/com/fasterxml/jackson/dataformat/smile/TestSmileParserNumbers.java b/src/test/java/com/fasterxml/jackson/dataformat/smile/TestSmileParserNumbers.java
index 5024db6..91497b5 100644
--- a/src/test/java/com/fasterxml/jackson/dataformat/smile/TestSmileParserNumbers.java
+++ b/src/test/java/com/fasterxml/jackson/dataformat/smile/TestSmileParserNumbers.java
@@ -4,8 +4,7 @@ import java.io.*;
import java.math.BigDecimal;
import java.math.BigInteger;
-import org.codehaus.jackson.JsonParser;
-import org.codehaus.jackson.JsonToken;
+import com.fasterxml.jackson.core.*;
import com.fasterxml.jackson.dataformat.smile.SmileGenerator;
import com.fasterxml.jackson.dataformat.smile.SmileParser;
diff --git a/src/test/java/com/fasterxml/jackson/dataformat/smile/TestSmileParserSymbolHandling.java b/src/test/java/com/fasterxml/jackson/dataformat/smile/TestSmileParserSymbolHandling.java
index 0d2f336..ea1fee1 100644
--- a/src/test/java/com/fasterxml/jackson/dataformat/smile/TestSmileParserSymbolHandling.java
+++ b/src/test/java/com/fasterxml/jackson/dataformat/smile/TestSmileParserSymbolHandling.java
@@ -3,9 +3,9 @@ package com.fasterxml.jackson.dataformat.smile;
import java.io.*;
import java.util.*;
-import org.codehaus.jackson.*;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.sym.BytesToNameCanonicalizer;
+import com.fasterxml.jackson.core.*;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.core.sym.BytesToNameCanonicalizer;
import com.fasterxml.jackson.dataformat.smile.SmileFactory;
import com.fasterxml.jackson.dataformat.smile.SmileGenerator;
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jackson-dataformat-smile.git
More information about the pkg-java-commits
mailing list