Skip to content

Commit 6291610

Browse files
committed
Solve conflicts.
1 parent 18f35e3 commit 6291610

File tree

1 file changed

+30
-25
lines changed

1 file changed

+30
-25
lines changed

pom.xml

Lines changed: 30 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,89 +1,94 @@
11
<project xmlns="http://maven.apache.org/POM/4.0.0"
22
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
33
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
4-
54
<modelVersion>4.0.0</modelVersion>
65
<groupId>MeshLibCore</groupId>
76
<artifactId>MeshLibCore</artifactId>
87
<version>0.0.1-SNAPSHOT</version>
9-
10-
<!-- Build Configuration -->
118
<build>
129
<sourceDirectory>src/main/java</sourceDirectory>
1310
<testSourceDirectory>src/test/java</testSourceDirectory>
1411
<plugins>
1512
<plugin>
1613
<artifactId>maven-compiler-plugin</artifactId>
17-
<version>3.13.0</version>
14+
<version>3.8.1</version>
1815
<configuration>
1916
<release>15</release>
2017
</configuration>
2118
</plugin>
2219
<plugin>
2320
<groupId>org.apache.maven.plugins</groupId>
2421
<artifactId>maven-surefire-plugin</artifactId>
25-
<version>3.0.0-M5</version> <!-- Updated to latest version
26-
compatible with JUnit 5 -->
22+
<version>2.22.2</version>
2723
<configuration>
28-
<useModulePath>false</useModulePath>
2924
</configuration>
3025
</plugin>
3126
</plugins>
3227
</build>
33-
34-
<!-- Repository Configuration -->
3528
<repositories>
3629
<repository>
3730
<name>JoGL Distrib</name>
3831
<id>org.jogamp</id>
3932
<url>https://www.jogamp.org/deployment/maven/</url>
4033
</repository>
4134
</repositories>
42-
43-
<!-- Dependencies -->
35+
<distributionManagement>
36+
<repository>
37+
<id>github</id>
38+
<name>GitHub ArtifactForms Apache Maven Packages</name>
39+
<url>https://maven.pkg.github.com/ArtifactForms/MeshLibCore/master</url>
40+
<releases>
41+
<enabled>true</enabled>
42+
</releases>
43+
<snapshots>
44+
<enabled>true</enabled>
45+
</snapshots>
46+
</repository>
47+
</distributionManagement>
4448
<dependencies>
45-
<!-- Processing Core -->
4649
<dependency>
4750
<groupId>org.processing</groupId>
4851
<artifactId>core</artifactId>
4952
<version>4.3.1</version>
5053
</dependency>
51-
52-
<!-- JoGL Gluegen -->
5354
<dependency>
5455
<groupId>org.jogamp.gluegen</groupId>
5556
<artifactId>gluegen-rt-main</artifactId>
5657
<version>2.5.0</version>
5758
</dependency>
58-
59-
<!-- JoGL -->
6059
<dependency>
6160
<groupId>org.jogamp.jogl</groupId>
6261
<artifactId>jogl-all-main</artifactId>
6362
<version>2.5.0</version>
6463
</dependency>
65-
66-
<!-- JUnit 5 Dependencies -->
64+
<dependency>
65+
<groupId>org.junit.platform</groupId>
66+
<artifactId>junit-platform-runner</artifactId>
67+
<version>1.2.0</version>
68+
<scope>test</scope>
69+
</dependency>
6770
<dependency>
6871
<groupId>org.junit.jupiter</groupId>
69-
<artifactId>junit-jupiter</artifactId>
70-
<version>5.11.3</version>
72+
<artifactId>junit-jupiter-engine</artifactId>
73+
<version>5.4.0</version>
7174
<scope>test</scope>
7275
</dependency>
73-
7476
<dependency>
7577
<groupId>org.junit.jupiter</groupId>
7678
<artifactId>junit-jupiter-params</artifactId>
77-
<version>5.11.3</version>
79+
<version>5.4.0</version>
80+
<scope>test</scope>
81+
</dependency>
82+
<dependency>
83+
<groupId>org.junit.jupiter</groupId>
84+
<artifactId>junit-jupiter-api</artifactId>
85+
<version>5.4.0</version>
7886
<scope>test</scope>
7987
</dependency>
80-
81-
<!-- Jacoco for Code Coverage -->
8288
<dependency>
8389
<groupId>org.jacoco</groupId>
8490
<artifactId>jacoco-maven-plugin</artifactId>
8591
<version>0.8.10</version>
8692
</dependency>
8793
</dependencies>
88-
8994
</project>

0 commit comments

Comments
 (0)