Skip to content
This repository was archived by the owner on Mar 8, 2020. It is now read-only.

Commit 22202c6

Browse files
authored
Merge pull request #107 from bzz/refubrish-before-sdk-update
Refurbish native part before SDK update
2 parents ac4e93c + 6280d15 commit 22202c6

File tree

3 files changed

+27
-11
lines changed

3 files changed

+27
-11
lines changed

.gitignore

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,11 @@ build
33

44
target
55
.m2
6+
7+
.classpath
8+
.factorypath
9+
.idea/
10+
.project
11+
.settings/
12+
.vscode/
13+
*.iml

native/pom.xml

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
<version>3.4</version>
3939
<scope>test</scope>
4040
</dependency>
41+
4142
<dependency>
4243
<groupId>org.eclipse.jdt</groupId>
4344
<artifactId>org.eclipse.jdt.core</artifactId>
@@ -61,19 +62,20 @@
6162
<dependency>
6263
<groupId>com.fasterxml.jackson.core</groupId>
6364
<artifactId>jackson-databind</artifactId>
64-
<version>2.8.6</version>
65+
<version>[2.8.11.3,)</version>
6566
</dependency>
6667
<dependency>
6768
<groupId>com.fasterxml.jackson.core</groupId>
6869
<artifactId>jackson-core</artifactId>
69-
<version>2.8.6</version>
70+
<version>[2.8.11.3,)</version>
7071
</dependency>
7172
<dependency>
7273
<groupId>com.fasterxml.jackson.core</groupId>
7374
<artifactId>jackson-annotations</artifactId>
74-
<version>2.8.6</version>
75+
<version>[2.8.11.3,)</version>
7576
</dependency>
7677
</dependencies>
78+
7779
<build>
7880
<finalName>native</finalName>
7981
<plugins>
@@ -114,13 +116,19 @@
114116
</archive>
115117
</configuration>
116118
</plugin>
117-
<plugin>
118-
<groupId>org.apache.maven.plugins</groupId>
119-
<artifactId>maven-surefire-plugin</artifactId>
120-
<configuration>
121-
<useSystemClassLoader>false</useSystemClassLoader>
122-
</configuration>
123-
</plugin>
124119
</plugins>
120+
<pluginManagement>
121+
<plugins>
122+
<plugin>
123+
<!-- Pin version to workaround
124+
"Error: Could not find or load main class org.apache.maven.surefire.booter.ForkedBooter"
125+
See http://archive.is/uKy4m for details.
126+
TODO(bzz) removed after java is update to >8u191-b12 (does not exist for openjdk:8-slim) -->
127+
<groupId>org.apache.maven.plugins</groupId>
128+
<artifactId>maven-surefire-plugin</artifactId>
129+
<version>3.0.0-M3</version>
130+
</plugin>
131+
</plugins>
132+
</pluginManagement>
125133
</build>
126134
</project>

native/src/test/java/bblfsh/DriverTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public void processInvalid() throws DriverException, CloseException {
6767
driver.processOne();
6868

6969
final String result = new String(out.toByteArray());
70-
assertThat(result).isEqualTo("{\"status\":\"fatal\",\"errors\":[\"Unrecognized token 'garbage': was expecting ('true', 'false' or 'null')\\n at [Source: garbage; line: 1, column: 15]\"]}\n");
70+
assertThat(result).isEqualTo("{\"status\":\"fatal\",\"errors\":[\"Unrecognized token 'garbage': was expecting ('true', 'false' or 'null')\\n at [Source: (String)\\\"garbage\\\"; line: 1, column: 15]\"]}\n");
7171
}
7272

7373
@Test

0 commit comments

Comments
 (0)