🐛 fix travis build

klask-io · Sep 18, 2020 · 28cf6f2 · 28cf6f2
1 parent 645f3b4
commit 28cf6f2
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 11 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,14 +1,11 @@
 language: node_js
 node_js:
-  - "4.4.3"
+  - 14
 
 sudo: false
 jdk:
-  - oraclejdk8
-addons:
-  apt:
-    packages:
-      - oracle-java8-set-default
+  - openjdk8
+
 before_install:
   - npm install -g bower
   - npm install -g gulp

diff --git a/pom.xml b/pom.xml
@@ -6,13 +6,13 @@
     <parent>
         <artifactId>spring-boot-starter-parent</artifactId>
         <groupId>org.springframework.boot</groupId>
-        <version>1.5.10.RELEASE</version>
+        <version>1.5.22.RELEASE</version>
         <relativePath/>
     </parent>
 
     <groupId>io.klask</groupId>
     <artifactId>klask</artifactId>
-    <version>0.2-SNAPSHOT</version>
+    <version>0.3-SNAPSHOT</version>
     <packaging>war</packaging>
     <name>klask</name>
 
@@ -21,6 +21,7 @@
     </prerequisites>
 
     <properties>
+        <jackson.version>2.8.11</jackson.version>
         <hikaricp.version>2.4.6</hikaricp.version>
         <assertj-core.version>3.3.0</assertj-core.version>
         <awaitility.version>1.7.0</awaitility.version>
@@ -47,7 +48,7 @@
         <logstash-logback-encoder.version>4.6</logstash-logback-encoder.version>
         <postgresql.version>9.4-1203-jdbc42</postgresql.version>
         <run.addResources>false</run.addResources>
-        <spring-security.version>4.1.0.RELEASE</spring-security.version>
+        <spring-security.version>4.2.18.RELEASE</spring-security.version>
         <springfox.version>2.4.0</springfox.version>
         <!-- Sonar properties -->
         <project.testresult.directory>${project.build.directory}/test-results</project.testresult.directory>

diff --git a/src/main/java/io/klask/service/IndexService.java b/src/main/java/io/klask/service/IndexService.java
@@ -55,6 +55,7 @@ public void initIndexes() {
         //delete default index named "file"
         if (!elasticsearchTemplate.indexExists(Constants.INDEX_NAME)) {
             elasticsearchTemplate.createIndex(File.class);
+            elasticsearchTemplate.putMapping(Constants.INDEX_NAME, Constants.TYPE_NAME, mappings);
         }
         AliasQuery aliasQuery = new AliasBuilder()
             .withIndexName(Constants.INDEX_NAME)

diff --git a/src/main/webapp/app/app.constants.js b/src/main/webapp/app/app.constants.js
@@ -3,7 +3,7 @@
     // DO NOT EDIT THIS FILE, EDIT THE GULP TASK NGCONSTANT SETTINGS INSTEAD WHICH GENERATES THIS FILE
     angular
         .module('klaskApp')
-        .constant('VERSION', "0.2-SNAPSHOT")
+        .constant('VERSION', "0.3-SNAPSHOT")
         .constant('DEBUG_INFO_ENABLED', true)
 ;
 })();
diff --git a/src/test/java/io/klask/web/rest/FileResourceIntTest.java b/src/test/java/io/klask/web/rest/FileResourceIntTest.java
@@ -4,6 +4,7 @@
 import io.klask.domain.File;
 import io.klask.repository.search.CustomSearchRepository;
 import io.klask.repository.search.FileSearchRepository;
+import io.klask.service.IndexService;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -64,6 +65,9 @@ public class FileResourceIntTest {
     @Inject
     private PageableHandlerMethodArgumentResolver pageableArgumentResolver;
 
+    @Inject
+    private IndexService indexService;
+
     private MockMvc restFileMockMvc;
 
     private File file;
@@ -77,6 +81,7 @@ public void setup() {
         this.restFileMockMvc = MockMvcBuilders.standaloneSetup(fileResource)
             .setCustomArgumentResolvers(pageableArgumentResolver)
             .setMessageConverters(jacksonMessageConverter).build();
+        indexService.initIndexes();
     }
 
     @Before

diff --git a/src/test/java/io/klask/web/rest/VersionResourceIntTest.java b/src/test/java/io/klask/web/rest/VersionResourceIntTest.java
@@ -4,6 +4,7 @@
 import io.klask.domain.File;
 import io.klask.repository.search.CustomSearchRepository;
 import io.klask.repository.search.FileSearchRepository;
+import io.klask.service.IndexService;
 import io.klask.web.rest.dto.VersionDTO;
 import org.junit.Before;
 import org.junit.Test;
@@ -63,6 +64,9 @@ public class VersionResourceIntTest {
     @Inject
     private FileSearchRepository fileSearchRepository;
 
+    @Inject
+    private IndexService indexService;
+
     private MockMvc restFileMockMvc;
 
     private List<VersionDTO> versions;
@@ -77,7 +81,7 @@ public void setup() {
         this.restFileMockMvc = MockMvcBuilders.standaloneSetup(versionResource)
             .setCustomArgumentResolvers(pageableArgumentResolver)
             .setMessageConverters(jacksonMessageConverter).build();
-
+        indexService.initIndexes();
     }
 
     @Before