Skip to content

Commit 2c9f8c5

Browse files
committed
Update versions in pom
1 parent a95719e commit 2c9f8c5

File tree

3 files changed

+23
-36
lines changed

3 files changed

+23
-36
lines changed

pom.xml

Lines changed: 7 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -25,42 +25,31 @@
2525
<dependency>
2626
<groupId>org.mockito</groupId>
2727
<artifactId>mockito-core</artifactId>
28-
<version>1.9.5</version>
28+
<version>2.7.9</version>
2929
<scope>test</scope>
3030
</dependency>
3131
</dependencies>
3232

3333
<build>
3434
<plugins>
35-
<!-- Configure Java compile version -->
3635
<plugin>
3736
<groupId>org.apache.maven.plugins</groupId>
3837
<artifactId>maven-compiler-plugin</artifactId>
39-
<version>3.1</version>
38+
<version>3.6.1</version>
4039
<configuration>
41-
<source>1.6</source>
42-
<target>1.6</target>
40+
<source>1.7</source>
41+
<target>1.7</target>
4342
</configuration>
4443
</plugin>
45-
46-
<!-- Test plugins -->
4744
<plugin>
4845
<groupId>org.apache.maven.plugins</groupId>
4946
<artifactId>maven-surefire-plugin</artifactId>
50-
<version>2.10</version>
47+
<version>2.19.1</version>
5148
</plugin>
52-
53-
<plugin>
54-
<groupId>org.apache.maven.plugins</groupId>
55-
<artifactId>maven-failsafe-plugin</artifactId>
56-
<version>2.16</version>
57-
</plugin>
58-
59-
<!-- Generate sources JAR -->
6049
<plugin>
6150
<groupId>org.apache.maven.plugins</groupId>
6251
<artifactId>maven-source-plugin</artifactId>
63-
<version>2.2.1</version>
52+
<version>3.0.1</version>
6453
<executions>
6554
<execution>
6655
<id>attach-sources</id>
@@ -70,12 +59,10 @@
7059
</execution>
7160
</executions>
7261
</plugin>
73-
74-
<!-- Generate javadoc JAR -->
7562
<plugin>
7663
<groupId>org.apache.maven.plugins</groupId>
7764
<artifactId>maven-javadoc-plugin</artifactId>
78-
<version>2.9</version>
65+
<version>2.10.4</version>
7966
<executions>
8067
<execution>
8168
<id>attach-javadoc</id>

src/test/java/com/momchil_atanasov/data/front/scanner/OBJScannerBasicTest.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,19 +42,19 @@ public void testComment() {
4242
@Test
4343
public void testVertices() {
4444
handler.assertVertexCount(4);
45-
handler.assertVertex(index++, -1.0f, 1.0f, -1.0f, null);
46-
handler.assertVertex(index++, -1.0f, -1.0f, 1.0f, null);
47-
handler.assertVertex(index++, 1.0f, -1.0f, -1.0f, null);
48-
handler.assertVertex(index++, 1.0f, 1.0f, 1.0f, null);
45+
handler.assertVertex(index++, -1.0f, 1.0f, -1.0f, 1.0f);
46+
handler.assertVertex(index++, -1.0f, -1.0f, 1.0f, 0.9f);
47+
handler.assertVertex(index++, 1.0f, -1.0f, -1.0f, 0.8f);
48+
handler.assertVertex(index++, 1.0f, 1.0f, 1.0f, 0.7f);
4949
}
5050

5151
@Test
5252
public void testTexCoords() {
5353
handler.assertTexCoordCount(4);
54-
handler.assertTexCoord(index++, 0.0f, 0.0f, null);
55-
handler.assertTexCoord(index++, 1.0f, 1.0f, null);
56-
handler.assertTexCoord(index++, 1.0f, 0.0f, null);
57-
handler.assertTexCoord(index++, 0.0f, 1.0f, null);
54+
handler.assertTexCoord(index++, 0.0f, 0.0f, 0.0f);
55+
handler.assertTexCoord(index++, 1.0f, 1.0f, 0.5f);
56+
handler.assertTexCoord(index++, 1.0f, 0.0f, 1.0f);
57+
handler.assertTexCoord(index++, 0.0f, 1.0f, 0.3f);
5858
}
5959

6060
@Test

src/test/resources/com/momchil_atanasov/data/front/test/scanner/obj/valid_basic.obj

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
mtllib valid_basic.mtl
44

5-
v -1.0 1.0 -1.0
6-
v -1.0 -1.0 1.0
7-
v 1.0 -1.0 -1.0
8-
v 1.0 1.0 1.0
5+
v -1.0 1.0 -1.0 1.0
6+
v -1.0 -1.0 1.0 0.9
7+
v 1.0 -1.0 -1.0 0.8
8+
v 1.0 1.0 1.0 0.7
99

10-
vt 0.0 0.0
11-
vt 1.0 1.0
12-
vt 1.0 0.0
13-
vt 0.0 1.0
10+
vt 0.0 0.0 0.0
11+
vt 1.0 1.0 0.5
12+
vt 1.0 0.0 1.0
13+
vt 0.0 1.0 0.3
1414

1515
vn 0.0 1.0 0.0
1616
vn 1.0 0.0 0.0

0 commit comments

Comments
 (0)