Skip to content

Commit 411ed97

Browse files
committed
Updated dependencies
1 parent 9f5ce3e commit 411ed97

33 files changed

+139
-97
lines changed

pom.xml

Lines changed: 31 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
<!--
2+
~ Copyright (C) 2016-2020, Stichting Mapcode Foundation (http://www.mapcode.com)
3+
~
4+
~ Licensed under the Apache License, Version 2.0 (the "License");
5+
~ you may not use this file except in compliance with the License.
6+
~ You may obtain a copy of the License at
7+
~
8+
~ http://www.apache.org/licenses/LICENSE-2.0
9+
~
10+
~ Unless required by applicable law or agreed to in writing, software
11+
~ distributed under the License is distributed on an "AS IS" BASIS,
12+
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
~ See the License for the specific language governing permissions and
14+
~ limitations under the License.
15+
-->
16+
117
<project xmlns="http://maven.apache.org/POM/4.0.0"
218
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
319
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
@@ -8,7 +24,7 @@
824
<artifactId>mapcode</artifactId>
925

1026
<packaging>jar</packaging>
11-
<version>2.4.14-SNAPSHOT</version>
27+
<version>2.4.14</version>
1228

1329
<name>Mapcode Java Library</name>
1430
<description>
@@ -36,15 +52,15 @@
3652
<name>Rijn Buve</name>
3753
<organization>Mapcode Foundation</organization>
3854
<roles>
39-
<role>Managing Director, main contributor</role>
55+
<role>Developer</role>
4056
</roles>
4157
</developer>
4258

4359
<developer>
4460
<id>matthew</id>
4561
<name>Matthew Lowden</name>
4662
<roles>
47-
<role>Original Java port</role>
63+
<role>Developer (original port from C++)</role>
4864
</roles>
4965
</developer>
5066
</developers>
@@ -73,22 +89,22 @@
7389

7490
<!-- Modules. -->
7591
<coveralls-maven-plugin.version>4.3.0</coveralls-maven-plugin.version>
76-
<jacoco-maven-plugin.version>0.8.4</jacoco-maven-plugin.version>
92+
<jacoco-maven-plugin.version>0.8.5</jacoco-maven-plugin.version>
7793
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
78-
<maven-javadoc-plugin.version>3.1.0</maven-javadoc-plugin.version>
94+
<maven-javadoc-plugin.version>3.2.0</maven-javadoc-plugin.version>
7995
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
8096
<maven-project-info-reports-plugin.version>3.0.0</maven-project-info-reports-plugin.version>
81-
<maven-site-plugin.version>3.7.1</maven-site-plugin.version>
82-
<maven-source-plugin.version>3.1.0</maven-source-plugin.version>
97+
<maven-site-plugin.version>3.9.0</maven-site-plugin.version>
98+
<maven-source-plugin.version>3.2.1</maven-source-plugin.version>
8399
<maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
84100
<nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version>
85101

86102
<!-- libraries. -->
87103
<gson.version>2.8.6</gson.version>
88104
<jsr305.version>3.0.2</jsr305.version>
89-
<junit.version>4.12</junit.version>
105+
<junit.version>4.13</junit.version>
90106
<log4j.version>1.2.17</log4j.version>
91-
<slf4j.version>1.7.26</slf4j.version>
107+
<slf4j.version>1.7.30</slf4j.version>
92108
</properties>
93109

94110
<distributionManagement>
@@ -282,18 +298,18 @@
282298
<scope>test</scope>
283299
</dependency>
284300

285-
<dependency>
286-
<groupId>org.slf4j</groupId>
287-
<artifactId>slf4j-api</artifactId>
288-
<version>${slf4j.version}</version>
289-
</dependency>
290-
291301
<dependency>
292302
<groupId>log4j</groupId>
293303
<artifactId>log4j</artifactId>
294304
<version>${log4j.version}</version>
295305
</dependency>
296306

307+
<dependency>
308+
<groupId>org.slf4j</groupId>
309+
<artifactId>slf4j-api</artifactId>
310+
<version>${slf4j.version}</version>
311+
</dependency>
312+
297313
<dependency>
298314
<groupId>org.slf4j</groupId>
299315
<artifactId>slf4j-log4j12</artifactId>

src/main/java/com/mapcode/Alphabet.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*
2-
* Copyright (C) 2014-2019, Stichting Mapcode Foundation (http://www.mapcode.com)
2+
* Copyright (C) 2016-2020, Stichting Mapcode Foundation (http://www.mapcode.com)
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
66
* You may obtain a copy of the License at
77
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
8+
* http://www.apache.org/licenses/LICENSE-2.0
99
*
1010
* Unless required by applicable law or agreed to in writing, software
1111
* distributed under the License is distributed on an "AS IS" BASIS,

src/main/java/com/mapcode/Boundary.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*
2-
* Copyright (C) 2014-2019, Stichting Mapcode Foundation (http://www.mapcode.com)
2+
* Copyright (C) 2016-2020, Stichting Mapcode Foundation (http://www.mapcode.com)
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
66
* You may obtain a copy of the License at
77
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
8+
* http://www.apache.org/licenses/LICENSE-2.0
99
*
1010
* Unless required by applicable law or agreed to in writing, software
1111
* distributed under the License is distributed on an "AS IS" BASIS,

src/main/java/com/mapcode/CheckArgs.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*
2-
* Copyright (C) 2014-2019, Stichting Mapcode Foundation (http://www.mapcode.com)
2+
* Copyright (C) 2016-2020, Stichting Mapcode Foundation (http://www.mapcode.com)
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
66
* You may obtain a copy of the License at
77
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
8+
* http://www.apache.org/licenses/LICENSE-2.0
99
*
1010
* Unless required by applicable law or agreed to in writing, software
1111
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -49,6 +49,7 @@ static void checkDefined(@Nonnull final String param, @Nonnull final Point point
4949
}
5050
}
5151

52+
@SuppressWarnings("OverlyBroadThrowsClause")
5253
static void checkMapcodeCode(@Nonnull final String param, @Nullable final String code)
5354
throws IllegalArgumentException {
5455
checkNonnull(param, code);

src/main/java/com/mapcode/Common.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*
2-
* Copyright (C) 2014-2019, Stichting Mapcode Foundation (http://www.mapcode.com)
2+
* Copyright (C) 2016-2020, Stichting Mapcode Foundation (http://www.mapcode.com)
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
66
* You may obtain a copy of the License at
77
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
8+
* http://www.apache.org/licenses/LICENSE-2.0
99
*
1010
* Unless required by applicable law or agreed to in writing, software
1111
* distributed under the License is distributed on an "AS IS" BASIS,

src/main/java/com/mapcode/Data.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*
2-
* Copyright (C) 2014-2019, Stichting Mapcode Foundation (http://www.mapcode.com)
2+
* Copyright (C) 2016-2020, Stichting Mapcode Foundation (http://www.mapcode.com)
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
66
* You may obtain a copy of the License at
77
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
8+
* http://www.apache.org/licenses/LICENSE-2.0
99
*
1010
* Unless required by applicable law or agreed to in writing, software
1111
* distributed under the License is distributed on an "AS IS" BASIS,

src/main/java/com/mapcode/DataModel.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*
2-
* Copyright (C) 2014-2019, Stichting Mapcode Foundation (http://www.mapcode.com)
2+
* Copyright (C) 2016-2020, Stichting Mapcode Foundation (http://www.mapcode.com)
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
66
* You may obtain a copy of the License at
77
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
8+
* http://www.apache.org/licenses/LICENSE-2.0
99
*
1010
* Unless required by applicable law or agreed to in writing, software
1111
* distributed under the License is distributed on an "AS IS" BASIS,

src/main/java/com/mapcode/Decoder.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*
2-
* Copyright (C) 2014-2019, Stichting Mapcode Foundation (http://www.mapcode.com)
2+
* Copyright (C) 2016-2020, Stichting Mapcode Foundation (http://www.mapcode.com)
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
66
* You may obtain a copy of the License at
77
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
8+
* http://www.apache.org/licenses/LICENSE-2.0
99
*
1010
* Unless required by applicable law or agreed to in writing, software
1111
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -678,6 +678,7 @@ private static String aeuUnpack(@Nonnull final String argStr) {
678678

679679
for (int v = 0; v <= lastpos; v++) {
680680
if (v != dotpos) {
681+
//noinspection RedundantCast
681682
final int i = (int) str.charAt(v);
682683
if (DECODE_CHARS[i] < 0) {
683684
return ""; // bad char!
@@ -839,7 +840,9 @@ private static MapcodeZone decodeExtension(
839840
final int extremeLatMicroDeg,
840841
final int maxLonMicroDeg) {
841842
final MapcodeZone mapcodeZone = new MapcodeZone();
843+
//noinspection RedundantCast
842844
double dividerx4 = (double) dividerx0;
845+
//noinspection RedundantCast
843846
double dividery = (double) dividery0;
844847
double processor = 1;
845848
int lon32 = 0;
@@ -849,6 +852,7 @@ private static MapcodeZone decodeExtension(
849852
// decode up to 8 characters
850853
final int len = (extrapostfix.length() > 8) ? 8 : extrapostfix.length();
851854
while (idx < len) {
855+
//noinspection RedundantCast
852856
int c1 = (int) extrapostfix.charAt(idx);
853857
idx++;
854858
c1 = DECODE_CHARS[c1];
@@ -861,6 +865,7 @@ private static MapcodeZone decodeExtension(
861865
final int y2;
862866
final int x2;
863867
if (idx < len) {
868+
//noinspection RedundantCast
864869
int c2 = (int) extrapostfix.charAt(idx);
865870
idx++;
866871
c2 = DECODE_CHARS[c2];
@@ -915,6 +920,7 @@ private static MapcodeZone decodeExtension(
915920

916921
private static boolean isAbjadScript(@Nonnull final String argStr) {
917922
for (final char ch : argStr.toCharArray()) {
923+
//noinspection RedundantCast
918924
final int c = (int) ch;
919925
if ((c >= 0x0628) && (c <= 0x0649)) {
920926
return true; // Arabic

src/main/java/com/mapcode/Encoder.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*
2-
* Copyright (C) 2014-2019, Stichting Mapcode Foundation (http://www.mapcode.com)
2+
* Copyright (C) 2016-2020, Stichting Mapcode Foundation (http://www.mapcode.com)
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
66
* You may obtain a copy of the License at
77
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
8+
* http://www.apache.org/licenses/LICENSE-2.0
99
*
1010
* Unless required by applicable law or agreed to in writing, software
1111
* distributed under the License is distributed on an "AS IS" BASIS,

src/main/java/com/mapcode/IncorrectDataModelException.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*
2-
* Copyright (C) 2014-2019, Stichting Mapcode Foundation (http://www.mapcode.com)
2+
* Copyright (C) 2016-2020, Stichting Mapcode Foundation (http://www.mapcode.com)
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
66
* You may obtain a copy of the License at
77
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
8+
* http://www.apache.org/licenses/LICENSE-2.0
99
*
1010
* Unless required by applicable law or agreed to in writing, software
1111
* distributed under the License is distributed on an "AS IS" BASIS,

0 commit comments

Comments
 (0)