Permalink
Browse files

updating jersey and jackson dependencies; using new version of the do…

…cker pluing
  • Loading branch information...
julsal authored and Juliano Efson Sales committed Dec 13, 2018
1 parent 73a1648 commit 7e96f0be8b0e0594cdc68f64913445e7f8e59856
@@ -12,7 +12,7 @@
<parent>
<groupId>org.lambda3.indra</groupId>
<artifactId>indra-parent</artifactId>
<version>2.2.0-rc8</version>
<version>2.2.1</version>
</parent>

<build>
@@ -12,7 +12,7 @@
<parent>
<groupId>org.lambda3.indra</groupId>
<artifactId>indra-parent</artifactId>
<version>2.2.0-rc8</version>
<version>2.2.1</version>
</parent>

<build>
@@ -9,7 +9,7 @@
<parent>
<groupId>org.lambda3.indra</groupId>
<artifactId>indra-parent</artifactId>
<version>2.2.0-rc8</version>
<version>2.2.1</version>
</parent>

<name>Indra Mongo Module</name>
@@ -12,12 +12,14 @@
<parent>
<groupId>org.lambda3.indra</groupId>
<artifactId>indra-parent</artifactId>
<version>2.2.0-rc8</version>
<version>2.2.1</version>
</parent>

<properties>
<server.mainClass>org.lambda3.indra.service.Indra</server.mainClass>
<jersey.version>2.22.3</jersey.version>
<jersey.version>2.26</jersey.version>
<jackson.version>2.9.7</jackson.version>

</properties>

<profiles>
@@ -119,7 +121,7 @@
<plugin>
<groupId>com.spotify</groupId>
<artifactId>docker-maven-plugin</artifactId>
<version>0.4.13</version>
<version>1.0.0</version>
<configuration>
<dockerDirectory>${project.build.directory}/docker-resources</dockerDirectory>
<pushImage>false</pushImage>
@@ -155,6 +157,13 @@
</configuration>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
<version>1.1.1</version>
</dependency>
</dependencies>
</plugin>

</plugins>
@@ -193,13 +202,18 @@
<artifactId>jersey-container-grizzly2-http</artifactId>
<version>${jersey.version}</version>
</dependency>

<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-json-jackson</artifactId>
<groupId>org.glassfish.jersey.inject</groupId>
<artifactId>jersey-hk2</artifactId>
<version>${jersey.version}</version>
</dependency>

<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
<version>${jackson.version}</version>
</dependency>

<dependency>
<groupId>org.lambda3.indra</groupId>
<artifactId>indra-core</artifactId>
@@ -26,10 +26,10 @@
* ==========================License-End===============================
*/

import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
import org.glassfish.grizzly.http.server.HttpServer;
import org.glassfish.jersey.filter.LoggingFilter;
import org.glassfish.jersey.grizzly2.httpserver.GrizzlyHttpServerFactory;
import org.glassfish.jersey.jackson.JacksonFeature;
import org.glassfish.jersey.logging.LoggingFeature;
import org.glassfish.jersey.server.ResourceConfig;
import org.lambda3.indra.core.IndraDriver;
import org.lambda3.indra.core.annoy.AnnoyVectorSpaceFactory;
@@ -73,8 +73,8 @@
this.baseUri = String.format("%s://%s:%s", PROTOCOL, host, port);
logger.info("Initializing Indra Service v. {}.", new VersionResponse().getVersion());
ResourceConfig rc = new ResourceConfig();
rc.register(LoggingFilter.class);
rc.register(JacksonFeature.class);
rc.register(LoggingFeature.class);
rc.register(JacksonJsonProvider.class);
rc.register(CatchAllExceptionMapper.class);
rc.register(SerializationExceptionMapper.class);

@@ -5,7 +5,7 @@
<parent>
<artifactId>indra-parent</artifactId>
<groupId>org.lambda3.indra</groupId>
<version>2.2.0-rc8</version>
<version>2.2.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>

@@ -6,7 +6,7 @@

<groupId>org.lambda3.indra</groupId>
<artifactId>indra-parent</artifactId>
<version>2.2.0-rc8</version>
<version>2.2.1</version>
<packaging>pom</packaging>

<name>Indra</name>

0 comments on commit 7e96f0b

Please sign in to comment.