Skip to content

Commit e2d7ff6

Browse files
committed
Merge remote-tracking branch 'jaro-sagan/uap_core_small_tweaks'
From ua-parser#23
2 parents 5193d40 + cdfcd8c commit e2d7ff6

File tree

4 files changed

+16
-10
lines changed

4 files changed

+16
-10
lines changed

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "uap-core"]
2+
path = uap-core
3+
url = https://github.com/ua-parser/uap-core.git

pom.xml

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,19 @@
44
<groupId>ua_parser</groupId>
55
<artifactId>ua-parser</artifactId>
66
<packaging>jar</packaging>
7-
<version>1.3.1-SNAPSHOT</version>
7+
<version>1.3.1-RELEASE</version>
88
<name>ua-parser</name>
99
<url>https://github.com/tobie/ua-parser/</url>
10+
1011
<properties>
1112
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1213
</properties>
14+
1315
<build>
1416
<resources>
1517
<resource>
1618
<targetPath>ua_parser</targetPath>
17-
<directory>${basedir}/../uap-core</directory>
19+
<directory>${basedir}/uap-core</directory>
1820
<includes>
1921
<include>regexes.yaml</include>
2022
</includes>
@@ -23,14 +25,14 @@
2325
<testResources>
2426
<testResource>
2527
<targetPath>ua_parser</targetPath>
26-
<directory>${basedir}/../uap-core/test_resources</directory>
28+
<directory>${basedir}/uap-core/test_resources</directory>
2729
<includes>
2830
<include>*.yaml</include>
2931
</includes>
3032
</testResource>
3133
<testResource>
3234
<targetPath>ua_parser</targetPath>
33-
<directory>${basedir}/../uap-core/tests</directory>
35+
<directory>${basedir}/uap-core/tests</directory>
3436
<includes>
3537
<include>*.yaml</include>
3638
</includes>
@@ -59,28 +61,29 @@
5961
</plugin>
6062
</plugins>
6163
</build>
64+
6265
<dependencies>
6366
<dependency>
6467
<groupId>org.yaml</groupId>
6568
<artifactId>snakeyaml</artifactId>
66-
<version>1.10</version>
69+
<version>1.18</version>
6770
</dependency>
6871
<dependency>
6972
<groupId>junit</groupId>
7073
<artifactId>junit</artifactId>
71-
<version>4.10</version>
74+
<version>4.12</version>
7275
<scope>test</scope>
7376
</dependency>
7477
<dependency>
7578
<groupId>org.hamcrest</groupId>
7679
<artifactId>hamcrest-all</artifactId>
77-
<version>1.1</version>
80+
<version>1.3</version>
7881
<scope>test</scope>
7982
</dependency>
8083
<dependency>
8184
<groupId>commons-collections</groupId>
8285
<artifactId>commons-collections</artifactId>
83-
<version>3.2.1</version>
86+
<version>3.2.2</version>
8487
</dependency>
8588
</dependencies>
8689
</project>

src/main/java/ua_parser/Parser.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
package ua_parser;
1818

19-
import java.io.IOException;
2019
import java.io.InputStream;
2120
import java.util.List;
2221
import java.util.Map;
@@ -36,7 +35,7 @@ public class Parser {
3635
private OSParser osParser;
3736
private DeviceParser deviceParser;
3837

39-
public Parser() throws IOException {
38+
public Parser() {
4039
this(Parser.class.getResourceAsStream(REGEX_YAML_PATH));
4140
}
4241

uap-core

Submodule uap-core added at 7b92326

0 commit comments

Comments
 (0)