Skip to content
GitLab
Commit 8e41ad48 authored by ethiraj krishnamanaidu's avatar ethiraj krishnamanaidu
Browse files

Merge branch 'fix_vulnerabilities' into 'master' 

fix whitesoure vulnerabilities

See merge request !28
parents d41f7f92 1607a4bc
Pipeline #9379 failed
Hide whitespace changes
Inline Side-by-side
pom.xml
View file @ 8e41ad48
......@@ -33,6 +33,12 @@
<properties>
<skip.unit.tests>false</skip.unit.tests>
<skip.integration.tests>true</skip.integration.tests>
<jackson.version>2.11.2</jackson.version>
<resteasy.version>3.12.0.Final</resteasy.version>
<elasticsearch.version>6.8.1</elasticsearch.version>
<snakeyaml.version>1.26</snakeyaml.version>
<commons-codec.version>1.14</commons-codec.version>
<hibernate-validator.version>6.1.5.Final</hibernate-validator.version>
</properties>
<licenses>
......@@ -86,10 +92,30 @@
</dependency>
<!--explicitly load latest compatible version with security fix in it-->
<dependency>
<groupId>org.elasticsearch</groupId>
<artifactId>elasticsearch</artifactId>
<version>${elasticsearch.version}</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>${commons-codec.version}</version>
</dependency>
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>${snakeyaml.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.9.9</version>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
......@@ -99,12 +125,12 @@
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jackson2-provider</artifactId>
<version>3.6.2.Final</version>
<version>${resteasy.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jaxrs</artifactId>
<version>3.6.2.Final</version>
<version>${resteasy.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
......@@ -176,7 +202,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-to-slf4j</artifactId>
<version>2.11.2</version>
<version>2.13.2</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
......@@ -235,7 +261,7 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
<version>6.0.17.Final</version>
<version>${hibernate-validator.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
......
provider/search-azure/pom.xml
View file @ 8e41ad48
......@@ -75,7 +75,6 @@
<dependency>
<groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator</artifactId>
<version>6.0.12.Final</version>
</dependency>
<dependency>
......
search-core/pom.xml
View file @ 8e41ad48
......@@ -37,6 +37,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<failOnMissingWebXml>false</failOnMissingWebXml>
<project.main.basedir>${project.basedir}</project.main.basedir>
<tomcat-embed-core.version>9.0.37</tomcat-embed-core.version>
</properties>
<dependencies>
......@@ -181,17 +182,17 @@
<dependency>
<groupId>org.elasticsearch</groupId>
<artifactId>elasticsearch</artifactId>
<version>6.6.2</version>
<version>${elasticsearch.version}</version>
</dependency>
<dependency>
<groupId>org.elasticsearch.client</groupId>
<artifactId>elasticsearch-rest-client</artifactId>
<version>6.6.2</version>
<version>${elasticsearch.version}</version>
</dependency>
<dependency>
<groupId>org.elasticsearch.client</groupId>
<artifactId>elasticsearch-rest-high-level-client</artifactId>
<version>6.6.2</version>
<version>${elasticsearch.version}</version>
</dependency>
<!--Test-->
......@@ -237,7 +238,7 @@
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
<version>9.0.21</version>
<version>${tomcat-embed-core.version}</version>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
......
search-core/src/test/java/org/opengroup/osdu/search/smart/models/AttributesTest.java
View file @ 8e41ad48
......@@ -30,6 +30,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.elasticsearch.action.admin.indices.mapping.get.GetFieldMappingsRequest;
import org.elasticsearch.action.admin.indices.mapping.get.GetFieldMappingsResponse;
import org.elasticsearch.action.admin.indices.mapping.get.GetFieldMappingsResponse.FieldMappingMetaData;
import org.elasticsearch.action.search.SearchResponse;
......@@ -113,7 +114,7 @@ public class AttributesTest {
when(elasticClientHandler.createRestClient()).thenReturn(restHighLevelClient);
doReturn(this.indicesClient).when(this.restHighLevelClient).indices();
GetFieldMappingsResponse getFieldMappingsResponse = mock(GetFieldMappingsResponse.class);
when(this.indicesClient.getFieldMapping(any(), any())).thenReturn(getFieldMappingsResponse);
when(this.indicesClient.getFieldMapping((GetFieldMappingsRequest) any(), any())).thenReturn(getFieldMappingsResponse);
XContentBuilder builder = XContentFactory.jsonBuilder();
builder.startObject();
Map<String, Object> fields = new HashMap();
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment