Skip to content

Commit 6907290

Browse files
author
Luc Boutier
committed
Fix error in dependency
Fix java version and java version compliance in test.
1 parent 5f30c45 commit 6907290

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

elasticsearch-mapping/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<artifactId>spring-context</artifactId>
2525
</dependency>
2626
<dependency>
27-
<groupId>fr.lucboutier.elasticsearch</groupId>
27+
<groupId>org.alien4cloud</groupId>
2828
<artifactId>elasticsearch-annotations</artifactId>
2929
<version>${project.version}</version>
3030
</dependency>

elasticsearch-mapping/src/test/java/org/elasticsearch/mapping/MappingBuilderTest.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package org.elasticsearch.mapping;
22

33
import java.beans.IntrospectionException;
4+
import java.io.BufferedReader;
5+
import java.io.FileReader;
46
import java.io.IOException;
57
import java.nio.file.Files;
68
import java.nio.file.Paths;
@@ -13,6 +15,8 @@
1315
import com.fasterxml.jackson.core.JsonGenerationException;
1416
import com.fasterxml.jackson.databind.JsonMappingException;
1517

18+
import static java.awt.SystemColor.text;
19+
1620
/**
1721
* Test the mappings.
1822
*
@@ -25,7 +29,8 @@ public void testSimpleClassMapping() throws IntrospectionException, JsonGenerati
2529
MappingBuilder mappingBuilder = new MappingBuilder();
2630
mappingBuilder.initialize("org.elasticsearch.mapping.model");
2731
String personMapping = mappingBuilder.getMapping(Person.class);
28-
String expected = Files.readAllLines(Paths.get("src/test/resources/mapping.json")).get(0);
32+
BufferedReader brTest = new BufferedReader(new FileReader(Paths.get("src/test/resources/mapping.json").toFile()));
33+
String expected = brTest .readLine();
2934
Assert.assertEquals(expected, personMapping);
3035
}
3136
}

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<spring.version>3.1.0.RELEASE</spring.version>
1616
<junit.version>4.10</junit.version>
1717

18-
<java.version>1.6</java.version>
18+
<java.version>1.7</java.version>
1919
<maven.compiler.version>2.3.2</maven.compiler.version>
2020
</properties>
2121

0 commit comments

Comments
 (0)