Skip to content

Commit 485578d

Browse files
committed
Merge remote-tracking branch 'origin/master'
Conflicts: affinity/pom.xml
2 parents 7e4f480 + c513c42 commit 485578d

File tree

1 file changed

+35
-5
lines changed

1 file changed

+35
-5
lines changed

affinity/pom.xml

Lines changed: 35 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,36 +32,66 @@
3232
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3333
</properties>
3434

35+
<dependencyManagement>
36+
37+
<dependencies>
38+
<!-- on linux install with sudo apt-get install libjna-java -->
39+
<dependency>
40+
<groupId>net.java.dev.jna</groupId>
41+
<artifactId>jna</artifactId>
42+
<version>4.1.0</version>
43+
</dependency>
44+
45+
<dependency>
46+
<groupId>net.java.dev.jna</groupId>
47+
<artifactId>jna-platform</artifactId>
48+
<version>4.1.0</version>
49+
</dependency>
50+
51+
<dependency>
52+
<groupId>org.kohsuke.jetbrains</groupId>
53+
<artifactId>annotations</artifactId>
54+
<version>9.0</version>
55+
</dependency>
56+
<dependency>
57+
<groupId>org.easymock</groupId>
58+
<artifactId>easymock</artifactId>
59+
<version>3.2</version>
60+
</dependency>
61+
<dependency>
62+
<groupId>junit</groupId>
63+
<artifactId>junit</artifactId>
64+
<version>4.11</version>
65+
</dependency>
66+
</dependencies>
67+
68+
</dependencyManagement>
69+
3570
<dependencies>
3671
<!-- on linux install with sudo apt-get install libjna-java -->
3772
<dependency>
3873
<groupId>net.java.dev.jna</groupId>
3974
<artifactId>jna</artifactId>
40-
<version>4.1.0</version>
4175
</dependency>
4276
<dependency>
4377
<groupId>net.java.dev.jna</groupId>
4478
<artifactId>jna-platform</artifactId>
45-
<version>4.1.0</version>
4679
</dependency>
4780

4881
<dependency>
4982
<groupId>org.kohsuke.jetbrains</groupId>
5083
<artifactId>annotations</artifactId>
51-
<version>9.0</version>
5284
<scope>compile</scope>
5385
</dependency>
5486

5587
<dependency>
5688
<groupId>org.easymock</groupId>
5789
<artifactId>easymock</artifactId>
58-
<version>3.2</version>
5990
<scope>test</scope>
6091
</dependency>
6192
<dependency>
6293
<groupId>junit</groupId>
6394
<artifactId>junit</artifactId>
64-
<version>4.11</version>
6595
<scope>test</scope>
6696
</dependency>
6797
</dependencies>

0 commit comments

Comments
 (0)