Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-18595 Set version in branch-2 from 2.0.0-alpha2-SNAPSHOT to 2.0.0-alpha2

This commit is contained in:
Michael Stack 2017-08-14 10:28:44 -07:00
parent c20ce21fe8
commit add9974515
36 changed files with 37 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hbase-annotations/pom.xml
View File

@ -23,7 +23,7 @@
<parent> <parent>
<artifactId>hbase</artifactId> <artifactId>hbase</artifactId>
<groupId>org.apache.hbase</groupId> <groupId>org.apache.hbase</groupId>
<version>2.0.0-alpha-2-SNAPSHOT</version> <version>2.0.0-alpha2</version>
<relativePath>..</relativePath> <relativePath>..</relativePath>
</parent> </parent>

2
hbase-archetypes/hbase-archetype-builder/pom.xml
View File

@ -25,7 +25,7 @@
<parent> <parent>
<artifactId>hbase-archetypes</artifactId> <artifactId>hbase-archetypes</artifactId>
<groupId>org.apache.hbase</groupId> <groupId>org.apache.hbase</groupId>
<version>2.0.0-alpha-2-SNAPSHOT</version> <version>2.0.0-alpha2</version>
<relativePath>..</relativePath> <relativePath>..</relativePath>
</parent> </parent>

2
hbase-archetypes/hbase-client-project/pom.xml
View File

@ -26,7 +26,7 @@
<parent> <parent>
<artifactId>hbase-archetypes</artifactId> <artifactId>hbase-archetypes</artifactId>
<groupId>org.apache.hbase</groupId> <groupId>org.apache.hbase</groupId>
<version>2.0.0-alpha-2-SNAPSHOT</version> <version>2.0.0-alpha2</version>
<relativePath>..</relativePath> <relativePath>..</relativePath>
</parent> </parent>
<artifactId>hbase-client-project</artifactId> <artifactId>hbase-client-project</artifactId>

2
hbase-archetypes/hbase-shaded-client-project/pom.xml
View File

@ -26,7 +26,7 @@
<parent> <parent>
<artifactId>hbase-archetypes</artifactId> <artifactId>hbase-archetypes</artifactId>
<groupId>org.apache.hbase</groupId> <groupId>org.apache.hbase</groupId>
<version>2.0.0-alpha-2-SNAPSHOT</version> <version>2.0.0-alpha2</version>
<relativePath>..</relativePath> <relativePath>..</relativePath>
</parent> </parent>
<artifactId>hbase-shaded-client-project</artifactId> <artifactId>hbase-shaded-client-project</artifactId>

2
hbase-archetypes/pom.xml
View File

@ -24,7 +24,7 @@
<parent> <parent>
<artifactId>hbase</artifactId> <artifactId>hbase</artifactId>
<groupId>org.apache.hbase</groupId> <groupId>org.apache.hbase</groupId>
<version>2.0.0-alpha-2-SNAPSHOT</version> <version>2.0.0-alpha2</version>
<relativePath>..</relativePath> <relativePath>..</relativePath>
</parent> </parent>

2
hbase-assembly/pom.xml
View File

@ -23,7 +23,7 @@
<parent> <parent>
<artifactId>hbase</artifactId> <artifactId>hbase</artifactId>
<groupId>org.apache.hbase</groupId> <groupId>org.apache.hbase</groupId>
<version>2.0.0-alpha-2-SNAPSHOT</version> <version>2.0.0-alpha2</version>
<relativePath>..</relativePath> <relativePath>..</relativePath>
</parent> </parent>
<artifactId>hbase-assembly</artifactId> <artifactId>hbase-assembly</artifactId>

4
hbase-checkstyle/pom.xml
View File

@ -24,7 +24,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.apache.hbase</groupId> <groupId>org.apache.hbase</groupId>
<artifactId>hbase-checkstyle</artifactId> <artifactId>hbase-checkstyle</artifactId>
<version>2.0.0-alpha-2-SNAPSHOT</version> <version>2.0.0-alpha2</version>
<name>Apache HBase - Checkstyle</name> <name>Apache HBase - Checkstyle</name>
<description>Module to hold Checkstyle properties for HBase.</description> <description>Module to hold Checkstyle properties for HBase.</description>
<!--REMOVE--> <!--REMOVE-->
@ -32,7 +32,7 @@
<parent> <parent>
<artifactId>hbase</artifactId> <artifactId>hbase</artifactId>
<groupId>org.apache.hbase</groupId> <groupId>org.apache.hbase</groupId>
<version>2.0.0-alpha-2-SNAPSHOT</version> <version>2.0.0-alpha2</version>
<relativePath>..</relativePath> <relativePath>..</relativePath>
</parent> </parent>

6
hbase-client/pom.xml
View File

@ -24,7 +24,7 @@
<parent> <parent>
<artifactId>hbase</artifactId> <artifactId>hbase</artifactId>
<groupId>org.apache.hbase</groupId> <groupId>org.apache.hbase</groupId>
<version>2.0.0-alpha-2-SNAPSHOT</version> <version>2.0.0-alpha2</version>
<relativePath>..</relativePath> <relativePath>..</relativePath>
</parent> </parent>
@ -171,10 +171,6 @@
<groupId>org.apache.htrace</groupId> <groupId>org.apache.htrace</groupId>
<artifactId>htrace-core</artifactId> <artifactId>htrace-core</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.jruby.jcodings</groupId> <groupId>org.jruby.jcodings</groupId>
<artifactId>jcodings</artifactId> <artifactId>jcodings</artifactId>

2
hbase-common/pom.xml
View File

@ -23,7 +23,7 @@
<parent> <parent>
<artifactId>hbase</artifactId> <artifactId>hbase</artifactId>
<groupId>org.apache.hbase</groupId> <groupId>org.apache.hbase</groupId>
<version>2.0.0-alpha-2-SNAPSHOT</version> <version>2.0.0-alpha2</version>
<relativePath>..</relativePath> <relativePath>..</relativePath>
</parent> </parent>

2
hbase-endpoint/pom.xml
View File

@ -23,7 +23,7 @@
<parent> <parent>
<artifactId>hbase</artifactId> <artifactId>hbase</artifactId>
<groupId>org.apache.hbase</groupId> <groupId>org.apache.hbase</groupId>
<version>2.0.0-alpha-2-SNAPSHOT</version> <version>2.0.0-alpha2</version>
<relativePath>..</relativePath> <relativePath>..</relativePath>
</parent> </parent>
<artifactId>hbase-endpoint</artifactId> <artifactId>hbase-endpoint</artifactId>

2
hbase-examples/pom.xml
View File

@ -23,7 +23,7 @@
<parent> <parent>
<artifactId>hbase</artifactId> <artifactId>hbase</artifactId>
<groupId>org.apache.hbase</groupId> <groupId>org.apache.hbase</groupId>
<version>2.0.0-alpha-2-SNAPSHOT</version> <version>2.0.0-alpha2</version>
<relativePath>..</relativePath> <relativePath>..</relativePath>
</parent> </parent>
<artifactId>hbase-examples</artifactId> <artifactId>hbase-examples</artifactId>

2
hbase-external-blockcache/pom.xml
View File

@ -25,7 +25,7 @@
<parent> <parent>
<artifactId>hbase</artifactId> <artifactId>hbase</artifactId>
<groupId>org.apache.hbase</groupId> <groupId>org.apache.hbase</groupId>
<version>2.0.0-alpha-2-SNAPSHOT</version> <version>2.0.0-alpha2</version>
<relativePath>..</relativePath> <relativePath>..</relativePath>
</parent> </parent>
<artifactId>hbase-external-blockcache</artifactId> <artifactId>hbase-external-blockcache</artifactId>

2
hbase-hadoop-compat/pom.xml
View File

@ -23,7 +23,7 @@
<parent> <parent>
<artifactId>hbase</artifactId> <artifactId>hbase</artifactId>
<groupId>org.apache.hbase</groupId> <groupId>org.apache.hbase</groupId>
<version>2.0.0-alpha-2-SNAPSHOT</version> <version>2.0.0-alpha2</version>
<relativePath>..</relativePath> <relativePath>..</relativePath>
</parent> </parent>

2
hbase-hadoop2-compat/pom.xml
View File

@ -21,7 +21,7 @@ limitations under the License.
<parent> <parent>
<artifactId>hbase</artifactId> <artifactId>hbase</artifactId>
<groupId>org.apache.hbase</groupId> <groupId>org.apache.hbase</groupId>
<version>2.0.0-alpha-2-SNAPSHOT</version> <version>2.0.0-alpha2</version>
<relativePath>..</relativePath> <relativePath>..</relativePath>
</parent> </parent>

2
hbase-it/pom.xml
View File

@ -23,7 +23,7 @@
<parent> <parent>
<artifactId>hbase</artifactId> <artifactId>hbase</artifactId>
<groupId>org.apache.hbase</groupId> <groupId>org.apache.hbase</groupId>
<version>2.0.0-alpha-2-SNAPSHOT</version> <version>2.0.0-alpha2</version>
<relativePath>..</relativePath> <relativePath>..</relativePath>
</parent> </parent>

2
hbase-metrics-api/pom.xml
View File

@ -23,7 +23,7 @@
<parent> <parent>
<artifactId>hbase</artifactId> <artifactId>hbase</artifactId>
<groupId>org.apache.hbase</groupId> <groupId>org.apache.hbase</groupId>
<version>2.0.0-alpha-2-SNAPSHOT</version> <version>2.0.0-alpha2</version>
<relativePath>..</relativePath> <relativePath>..</relativePath>
</parent> </parent>

2
hbase-metrics/pom.xml
View File

@ -23,7 +23,7 @@
<parent> <parent>
<artifactId>hbase</artifactId> <artifactId>hbase</artifactId>
<groupId>org.apache.hbase</groupId> <groupId>org.apache.hbase</groupId>
<version>2.0.0-alpha-2-SNAPSHOT</version> <version>2.0.0-alpha2</version>
<relativePath>..</relativePath> <relativePath>..</relativePath>
</parent> </parent>

2
hbase-prefix-tree/pom.xml
View File

@ -23,7 +23,7 @@
<parent> <parent>
<artifactId>hbase</artifactId> <artifactId>hbase</artifactId>
<groupId>org.apache.hbase</groupId> <groupId>org.apache.hbase</groupId>
<version>2.0.0-alpha-2-SNAPSHOT</version> <version>2.0.0-alpha2</version>
<relativePath>..</relativePath> <relativePath>..</relativePath>
</parent> </parent>

2
hbase-procedure/pom.xml
View File

@ -23,7 +23,7 @@
<parent> <parent>
<artifactId>hbase</artifactId> <artifactId>hbase</artifactId>
<groupId>org.apache.hbase</groupId> <groupId>org.apache.hbase</groupId>
<version>2.0.0-alpha-2-SNAPSHOT</version> <version>2.0.0-alpha2</version>
<relativePath>..</relativePath> <relativePath>..</relativePath>
</parent> </parent>

2
hbase-protocol-shaded/pom.xml
View File

@ -23,7 +23,7 @@
<parent> <parent>
<artifactId>hbase</artifactId> <artifactId>hbase</artifactId>
<groupId>org.apache.hbase</groupId> <groupId>org.apache.hbase</groupId>
<version>2.0.0-alpha-2-SNAPSHOT</version> <version>2.0.0-alpha2</version>
<relativePath>..</relativePath> <relativePath>..</relativePath>
</parent> </parent>
<artifactId>hbase-protocol-shaded</artifactId> <artifactId>hbase-protocol-shaded</artifactId>

2
hbase-protocol/pom.xml
View File

@ -23,7 +23,7 @@
<parent> <parent>
<artifactId>hbase</artifactId> <artifactId>hbase</artifactId>
<groupId>org.apache.hbase</groupId> <groupId>org.apache.hbase</groupId>
<version>2.0.0-alpha-2-SNAPSHOT</version> <version>2.0.0-alpha2</version>
<relativePath>..</relativePath> <relativePath>..</relativePath>
</parent> </parent>
<artifactId>hbase-protocol</artifactId> <artifactId>hbase-protocol</artifactId>

2
hbase-resource-bundle/pom.xml
View File

@ -23,7 +23,7 @@
<parent> <parent>
<artifactId>hbase</artifactId> <artifactId>hbase</artifactId>
<groupId>org.apache.hbase</groupId> <groupId>org.apache.hbase</groupId>
<version>2.0.0-alpha-2-SNAPSHOT</version> <version>2.0.0-alpha2</version>
<relativePath>..</relativePath> <relativePath>..</relativePath>
</parent> </parent>

6
hbase-rest/pom.xml
View File

@ -23,7 +23,7 @@
<parent> <parent>
<artifactId>hbase</artifactId> <artifactId>hbase</artifactId>
<groupId>org.apache.hbase</groupId> <groupId>org.apache.hbase</groupId>
<version>2.0.0-alpha-2-SNAPSHOT</version> <version>2.0.0-alpha2</version>
<relativePath>..</relativePath> <relativePath>..</relativePath>
</parent> </parent>
<artifactId>hbase-rest</artifactId> <artifactId>hbase-rest</artifactId>
@ -309,10 +309,6 @@
<groupId>org.glassfish.jersey.containers</groupId> <groupId>org.glassfish.jersey.containers</groupId>
<artifactId>jersey-container-servlet-core</artifactId> <artifactId>jersey-container-servlet-core</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-json-jackson1</artifactId>
</dependency>
</dependencies> </dependencies>
<profiles> <profiles>
<!-- Skip the tests in this module --> <!-- Skip the tests in this module -->

4
hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/RESTServer.java
View File

@ -66,7 +66,6 @@ import org.eclipse.jetty.util.thread.QueuedThreadPool;
import org.eclipse.jetty.jmx.MBeanContainer; import org.eclipse.jetty.jmx.MBeanContainer;
import org.eclipse.jetty.servlet.FilterHolder; import org.eclipse.jetty.servlet.FilterHolder;
import org.glassfish.jersey.jackson1.Jackson1Feature;
import org.glassfish.jersey.server.ResourceConfig; import org.glassfish.jersey.server.ResourceConfig;
import org.glassfish.jersey.servlet.ServletContainer; import org.glassfish.jersey.servlet.ServletContainer;
@ -236,8 +235,7 @@ public class RESTServer implements Constants {
parseCommandLine(args, servlet); parseCommandLine(args, servlet);
// set up the Jersey servlet container for Jetty // set up the Jersey servlet container for Jetty
ResourceConfig application = new ResourceConfig(). ResourceConfig application = new ResourceConfig();
packages("org.apache.hadoop.hbase.rest").register(Jackson1Feature.class);
ServletHolder sh = new ServletHolder(new ServletContainer(application)); ServletHolder sh = new ServletHolder(new ServletContainer(application));
// Set the default max thread number to 100 to limit // Set the default max thread number to 100 to limit

4
hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/HBaseRESTTestingUtility.java
View File

@ -34,7 +34,6 @@ import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.servlet.ServletHolder; import org.eclipse.jetty.servlet.ServletHolder;
import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.servlet.ServletContextHandler;
import org.glassfish.jersey.jackson1.Jackson1Feature;
import org.glassfish.jersey.server.ResourceConfig; import org.glassfish.jersey.server.ResourceConfig;
import org.glassfish.jersey.servlet.ServletContainer; import org.glassfish.jersey.servlet.ServletContainer;
@ -62,8 +61,7 @@ public class HBaseRESTTestingUtility {
RESTServlet.getInstance(conf, UserProvider.instantiate(conf)); RESTServlet.getInstance(conf, UserProvider.instantiate(conf));
// set up the Jersey servlet container for Jetty // set up the Jersey servlet container for Jetty
ResourceConfig app = new ResourceConfig(). ResourceConfig app = new ResourceConfig();
packages("org.apache.hadoop.hbase.rest").register(Jackson1Feature.class);
ServletHolder sh = new ServletHolder(new ServletContainer(app)); ServletHolder sh = new ServletHolder(new ServletContainer(app));
// set up Jetty and run the embedded server // set up Jetty and run the embedded server

6
hbase-rsgroup/pom.xml
View File

@ -23,7 +23,7 @@
<parent> <parent>
<artifactId>hbase</artifactId> <artifactId>hbase</artifactId>
<groupId>org.apache.hbase</groupId> <groupId>org.apache.hbase</groupId>
<version>2.0.0-alpha-2-SNAPSHOT</version> <version>2.0.0-alpha2</version>
<relativePath>..</relativePath> <relativePath>..</relativePath>
</parent> </parent>
<artifactId>hbase-rsgroup</artifactId> <artifactId>hbase-rsgroup</artifactId>
@ -170,10 +170,6 @@
<groupId>org.apache.htrace</groupId> <groupId>org.apache.htrace</groupId>
<artifactId>htrace-core</artifactId> <artifactId>htrace-core</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.jruby.jcodings</groupId> <groupId>org.jruby.jcodings</groupId>
<artifactId>jcodings</artifactId> <artifactId>jcodings</artifactId>

6
hbase-server/pom.xml
View File

@ -23,7 +23,7 @@
<parent> <parent>
<artifactId>hbase</artifactId> <artifactId>hbase</artifactId>
<groupId>org.apache.hbase</groupId> <groupId>org.apache.hbase</groupId>
<version>2.0.0-alpha-2-SNAPSHOT</version> <version>2.0.0-alpha2</version>
<relativePath>..</relativePath> <relativePath>..</relativePath>
</parent> </parent>
<artifactId>hbase-server</artifactId> <artifactId>hbase-server</artifactId>
@ -472,10 +472,6 @@
<groupId>org.glassfish.jersey.containers</groupId> <groupId>org.glassfish.jersey.containers</groupId>
<artifactId>jersey-container-servlet-core</artifactId> <artifactId>jersey-container-servlet-core</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-json-jackson1</artifactId>
</dependency>
<!-- General dependencies --> <!-- General dependencies -->
<dependency> <dependency>
<groupId>com.github.stephenc.findbugs</groupId> <groupId>com.github.stephenc.findbugs</groupId>

2
hbase-shaded/hbase-shaded-client/pom.xml
View File

@ -24,7 +24,7 @@
<parent> <parent>
<artifactId>hbase-shaded</artifactId> <artifactId>hbase-shaded</artifactId>
<groupId>org.apache.hbase</groupId> <groupId>org.apache.hbase</groupId>
<version>2.0.0-alpha-2-SNAPSHOT</version> <version>2.0.0-alpha2</version>
<relativePath>..</relativePath> <relativePath>..</relativePath>
</parent> </parent>
<artifactId>hbase-shaded-client</artifactId> <artifactId>hbase-shaded-client</artifactId>

2
hbase-shaded/hbase-shaded-server/pom.xml
View File

@ -24,7 +24,7 @@
<parent> <parent>
<artifactId>hbase-shaded</artifactId> <artifactId>hbase-shaded</artifactId>
<groupId>org.apache.hbase</groupId> <groupId>org.apache.hbase</groupId>
<version>2.0.0-alpha-2-SNAPSHOT</version> <version>2.0.0-alpha2</version>
<relativePath>..</relativePath> <relativePath>..</relativePath>
</parent> </parent>
<artifactId>hbase-shaded-server</artifactId> <artifactId>hbase-shaded-server</artifactId>

2
hbase-shaded/pom.xml
View File

@ -23,7 +23,7 @@
<parent> <parent>
<artifactId>hbase</artifactId> <artifactId>hbase</artifactId>
<groupId>org.apache.hbase</groupId> <groupId>org.apache.hbase</groupId>
<version>2.0.0-alpha-2-SNAPSHOT</version> <version>2.0.0-alpha2</version>
<relativePath>..</relativePath> <relativePath>..</relativePath>
</parent> </parent>
<artifactId>hbase-shaded</artifactId> <artifactId>hbase-shaded</artifactId>

2
hbase-shell/pom.xml
View File

@ -23,7 +23,7 @@
<parent> <parent>
<artifactId>hbase</artifactId> <artifactId>hbase</artifactId>
<groupId>org.apache.hbase</groupId> <groupId>org.apache.hbase</groupId>
<version>2.0.0-alpha-2-SNAPSHOT</version> <version>2.0.0-alpha2</version>
<relativePath>..</relativePath> <relativePath>..</relativePath>
</parent> </parent>
<artifactId>hbase-shell</artifactId> <artifactId>hbase-shell</artifactId>

2
hbase-spark-it/pom.xml
View File

@ -23,7 +23,7 @@
<parent> <parent>
<artifactId>hbase</artifactId> <artifactId>hbase</artifactId>
<groupId>org.apache.hbase</groupId> <groupId>org.apache.hbase</groupId>
<version>2.0.0-alpha-2-SNAPSHOT</version> <version>2.0.0-alpha2</version>
<relativePath>..</relativePath> <relativePath>..</relativePath>
</parent> </parent>

2
hbase-spark/pom.xml
View File

@ -24,7 +24,7 @@
<parent> <parent>
<artifactId>hbase</artifactId> <artifactId>hbase</artifactId>
<groupId>org.apache.hbase</groupId> <groupId>org.apache.hbase</groupId>
<version>2.0.0-alpha-2-SNAPSHOT</version> <version>2.0.0-alpha2</version>
<relativePath>..</relativePath> <relativePath>..</relativePath>
</parent> </parent>
<artifactId>hbase-spark</artifactId> <artifactId>hbase-spark</artifactId>

2
hbase-testing-util/pom.xml
View File

@ -23,7 +23,7 @@
<parent> <parent>
<artifactId>hbase</artifactId> <artifactId>hbase</artifactId>
<groupId>org.apache.hbase</groupId> <groupId>org.apache.hbase</groupId>
<version>2.0.0-alpha-2-SNAPSHOT</version> <version>2.0.0-alpha2</version>
<relativePath>..</relativePath> <relativePath>..</relativePath>
</parent> </parent>
<artifactId>hbase-testing-util</artifactId> <artifactId>hbase-testing-util</artifactId>

2
hbase-thrift/pom.xml
View File

@ -25,7 +25,7 @@
<parent> <parent>
<artifactId>hbase</artifactId> <artifactId>hbase</artifactId>
<groupId>org.apache.hbase</groupId> <groupId>org.apache.hbase</groupId>
<version>2.0.0-alpha-2-SNAPSHOT</version> <version>2.0.0-alpha2</version>
<relativePath>..</relativePath> <relativePath>..</relativePath>
</parent> </parent>
<artifactId>hbase-thrift</artifactId> <artifactId>hbase-thrift</artifactId>

31
pom.xml
View File

@ -39,7 +39,7 @@
<groupId>org.apache.hbase</groupId> <groupId>org.apache.hbase</groupId>
<artifactId>hbase</artifactId> <artifactId>hbase</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<version>2.0.0-alpha-2-SNAPSHOT</version> <version>2.0.0-alpha2</version>
<name>Apache HBase</name> <name>Apache HBase</name>
<description> <description>
Apache HBase™ is the Hadoop database. Use it when you need Apache HBase™ is the Hadoop database. Use it when you need
@ -1354,7 +1354,6 @@
<jaxb-api.version>2.2.12</jaxb-api.version> <jaxb-api.version>2.2.12</jaxb-api.version>
<jetty.version>9.3.8.v20160314</jetty.version> <jetty.version>9.3.8.v20160314</jetty.version>
<jetty-jsp.version>9.2.19.v20160908</jetty-jsp.version> <jetty-jsp.version>9.2.19.v20160908</jetty-jsp.version>
<jackson1.version>1.9.13</jackson1.version>
<servlet.api.version>3.1.0</servlet.api.version> <servlet.api.version>3.1.0</servlet.api.version>
<wx.rs.api.version>2.0.1</wx.rs.api.version> <wx.rs.api.version>2.0.1</wx.rs.api.version>
<jersey.version>2.25.1</jersey.version> <jersey.version>2.25.1</jersey.version>
@ -1797,29 +1796,6 @@
<artifactId>joni</artifactId> <artifactId>joni</artifactId>
<version>${joni.version}</version> <version>${joni.version}</version>
</dependency> </dependency>
<!-- While jackson is also a dependency of jersey it
can bring in jars from different, incompatible versions. We force
the same version with these dependencies -->
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId>
<version>${jackson1.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
<version>${jackson1.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-jaxrs</artifactId>
<version>${jackson1.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-xc</artifactId>
<version>${jackson1.version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.jamon</groupId> <groupId>org.jamon</groupId>
<artifactId>jamon-runtime</artifactId> <artifactId>jamon-runtime</artifactId>
@ -1902,11 +1878,6 @@
<artifactId>jersey-container-servlet-core</artifactId> <artifactId>jersey-container-servlet-core</artifactId>
<version>${jersey.version}</version> <version>${jersey.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-json-jackson1</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency> <dependency>
<groupId>javax.xml.bind</groupId> <groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId> <artifactId>jaxb-api</artifactId>