From f53ee31d37e3f4a1656811bb45401687d2e85d36 Mon Sep 17 00:00:00 2001 From: Rijn Buve Date: Tue, 1 Nov 2016 09:44:05 +0100 Subject: [PATCH 01/25] Release 2.4.1 --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 6d7568a..450becd 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.mapcode mapcode-example jar - 2.4.0 + 2.4.1 Mapcode Java Example @@ -30,9 +30,9 @@ 3.5.1 - 2.4.0 + 2.4.1 1.2.17 - 1.7.12 + 1.7.21 From b8058524bea7a0f7f44589f5a90b37e33137de5c Mon Sep 17 00:00:00 2001 From: Rijn Buve Date: Fri, 4 Nov 2016 18:36:46 +0100 Subject: [PATCH 02/25] Updated copyright --- NOTICE | 2 +- src/main/java/com/mapcode/example/Example.java | 2 +- src/main/resources/log4j.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/NOTICE b/NOTICE index b61ad67..1c6b892 100644 --- a/NOTICE +++ b/NOTICE @@ -1,4 +1,4 @@ Original C library created by Pieter Geelen. Work on Java version of the Mapcode library by Rijn Buve (original port by Matthew Lowden). -Copyright (C) 2014-2015 Stichting Mapcode Foundation (http://www.mapcode.com) +Copyright (C) 2014-2016, Stichting Mapcode Foundation (http://www.mapcode.com) diff --git a/src/main/java/com/mapcode/example/Example.java b/src/main/java/com/mapcode/example/Example.java index a700409..c6058b0 100644 --- a/src/main/java/com/mapcode/example/Example.java +++ b/src/main/java/com/mapcode/example/Example.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2014-2015 Stichting Mapcode Foundation (http://www.mapcode.com) + * Copyright (C) 2014-2016, Stichting Mapcode Foundation (http://www.mapcode.com) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/resources/log4j.xml b/src/main/resources/log4j.xml index 7e44b90..c8c65e1 100644 --- a/src/main/resources/log4j.xml +++ b/src/main/resources/log4j.xml @@ -1,6 +1,6 @@ - 2.4.1 + 2.4.2 1.2.17 1.7.21 From d1ca126e1451f9d636656fa88ab86681080fdf78 Mon Sep 17 00:00:00 2001 From: Rijn Buve Date: Tue, 20 Jun 2017 15:39:22 +0200 Subject: [PATCH 04/25] Updated README build icon (branch=master) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 81ac079..af716b4 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Example Project for Mapcode Library for Java -[![Build Status](https://img.shields.io/travis/mapcode-foundation/mapcode-java-example.svg?maxAge=3600)](https://travis-ci.org/mapcode-foundation/mapcode-java-example) +[![Build Status](https://img.shields.io/travis/mapcode-foundation/mapcode-java-example.svg?maxAge=3600&branch=master)](https://travis-ci.org/mapcode-foundation/mapcode-java-example) [![License](http://img.shields.io/badge/license-APACHE2-blue.svg)]() **Copyright (C) 2014-2016 Stichting Mapcode Foundation (http://www.mapcode.com)** From faffc08ba57cc81e332356708b61f193ef748f5d Mon Sep 17 00:00:00 2001 From: Rijn Buve Date: Thu, 22 Jun 2017 13:09:44 +0200 Subject: [PATCH 05/25] Updated POMs --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index f3a3715..0bffe60 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.mapcode mapcode-example jar - 2.4.2 + 2.4.3.0 Mapcode Java Example @@ -30,9 +30,9 @@ 3.5.1 - 2.4.2 + 2.4.3 1.2.17 - 1.7.21 + 1.7.25 From 4a99877ecae3625260ea5d82f0ef78a415e8aad0 Mon Sep 17 00:00:00 2001 From: Rijn Buve Date: Fri, 21 Jul 2017 12:36:35 +0200 Subject: [PATCH 06/25] Released --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 0bffe60..6ccce58 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.mapcode mapcode-example jar - 2.4.3.0 + 2.4.4.0 Mapcode Java Example @@ -30,7 +30,7 @@ 3.5.1 - 2.4.3 + 2.4.4 1.2.17 1.7.25 From fc2815392d1add1dbceeb3e946e3a05e95c1e393 Mon Sep 17 00:00:00 2001 From: Rijn Buve Date: Wed, 16 Aug 2017 18:52:22 +0200 Subject: [PATCH 07/25] Added file.encoding=UTF8 --- .travis.yml | 5 ++++- README.md | 5 +++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c3db386..237f6f7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,9 +5,12 @@ sudo: false jdk: - oraclejdk8 -install: mvn install -DskipTests +install: + - export JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF8" + - mvn install -DskipTests script: + - export JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF8" - mvn verify cache: diff --git a/README.md b/README.md index af716b4..bd0fab8 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,11 @@ This Java project contains example code of how to use the Mapcode Library. +First, make sure you have the correct file encoding (UTF8) set for Java on your system. +Include this environment variable in your `.profile` or `.bashrc`: + + export JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF8" + To run the examples, simply execute: mvn clean install From 7909b44903f0de2f26a6d8a611c80bff77b39887 Mon Sep 17 00:00:00 2001 From: Rijn Buve Date: Wed, 20 Sep 2017 10:57:08 +0200 Subject: [PATCH 08/25] Moved to Mapcode Java library 2.4.5 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 6ccce58..8b20e5b 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.mapcode mapcode-example jar - 2.4.4.0 + 2.4.5.0 Mapcode Java Example @@ -30,7 +30,7 @@ 3.5.1 - 2.4.4 + 2.4.5 1.2.17 1.7.25 From 6e17cc7c655eaee862beda5e4f2cf85a8b4cd843 Mon Sep 17 00:00:00 2001 From: Rijn Buve Date: Wed, 20 Sep 2017 13:08:37 +0200 Subject: [PATCH 09/25] Updated README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index bd0fab8..522c94b 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ [![Build Status](https://img.shields.io/travis/mapcode-foundation/mapcode-java-example.svg?maxAge=3600&branch=master)](https://travis-ci.org/mapcode-foundation/mapcode-java-example) [![License](http://img.shields.io/badge/license-APACHE2-blue.svg)]() -**Copyright (C) 2014-2016 Stichting Mapcode Foundation (http://www.mapcode.com)** +**Copyright (C) 2014-2017 Stichting Mapcode Foundation (http://www.mapcode.com)** This Java project contains example code of how to use the Mapcode Library. From 53e28f58ac59491914fb250be58c49ebc2f527bf Mon Sep 17 00:00:00 2001 From: Rijn Buve Date: Fri, 11 May 2018 17:53:07 +0200 Subject: [PATCH 10/25] Fixed POM --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 8b20e5b..4422bc5 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.mapcode mapcode-example jar - 2.4.5.0 + 2.4.7.0 Mapcode Java Example @@ -30,7 +30,7 @@ 3.5.1 - 2.4.5 + 2.4.7 1.2.17 1.7.25 From 38896d6be69e9166b9b89d9ec688dd3ae79939ef Mon Sep 17 00:00:00 2001 From: Rijn Buve Date: Fri, 11 May 2018 17:53:47 +0200 Subject: [PATCH 11/25] Fixed README --- README.md | 43 ------------------------------------------- 1 file changed, 43 deletions(-) diff --git a/README.md b/README.md index 522c94b..421b8e8 100644 --- a/README.md +++ b/README.md @@ -39,46 +39,3 @@ limitations under the License. Original C version created by Pieter Geelen. Work on Java version of the Mapcode library by Rijn Buve and Matthew Lowden. - -## Release Notes - -### 2.4.0 - -* Added new scripts. - -### 2.3.0 - 2.3.2 - -* Updated to Java library 2.3.0, 2.3.2. - -### 2.2.4 - -* Updated to Java library 2.2.4. - -### 2.2.1-2.2.3 - -* Updated to new Mapcode Java Library version 2.2.x. - -### 2.0.0.0 - 2.0.1.0 - -* Updated to new Mapcode Java Library version 2.0.x. - -### 1.50.0.0 - 1.50.3.0 - -* Updated to new Mapcode Java Library versions. - -### 1.40.2 - -* Updated to Mapcode Java Library version 1.40.2. - -### 1.40 - -* Added high precision Mapcodes. - -### 1.33.2 - -* Clean-up of release 1.33.2. Added release notes. - -### 1.33.1 - -* First release of Java library for MapCodes. - From 52303a56a8c59b53f42aa89cc1abd0db6bb79c32 Mon Sep 17 00:00:00 2001 From: Rijn Buve Date: Wed, 5 Dec 2018 10:42:38 +0100 Subject: [PATCH 12/25] Fixed copyright in LICENSE --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index d645695..2ed96dd 100644 --- a/LICENSE +++ b/LICENSE @@ -187,7 +187,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright [yyyy] [name of copyright owner] + Copyright 2018, Stichting Mapcode Foundation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. From 594f6c02d14a334964691b9dbf032e8543fe2de1 Mon Sep 17 00:00:00 2001 From: Rijn Buve Date: Wed, 5 Dec 2018 12:50:32 +0100 Subject: [PATCH 13/25] Fixed LICENSE file --- LICENSE | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/LICENSE b/LICENSE index 2ed96dd..59cfcac 100644 --- a/LICENSE +++ b/LICENSE @@ -176,17 +176,6 @@ END OF TERMS AND CONDITIONS - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - Copyright 2018, Stichting Mapcode Foundation Licensed under the Apache License, Version 2.0 (the "License"); From c23c254d4f05530a7983e6dcc3176cf4a7c27d96 Mon Sep 17 00:00:00 2001 From: Rijn Buve Date: Tue, 22 Jan 2019 14:13:31 +0100 Subject: [PATCH 14/25] Updated deps and copyright --- LICENSE | 2 +- NOTICE | 2 +- README.md | 2 +- pom.xml | 4 ++-- src/main/java/com/mapcode/example/Example.java | 2 +- src/main/resources/log4j.xml | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/LICENSE b/LICENSE index 59cfcac..0f28414 100644 --- a/LICENSE +++ b/LICENSE @@ -176,7 +176,7 @@ END OF TERMS AND CONDITIONS - Copyright 2018, Stichting Mapcode Foundation + Copyright 2019, Stichting Mapcode Foundation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/NOTICE b/NOTICE index 1c6b892..cf8c202 100644 --- a/NOTICE +++ b/NOTICE @@ -1,4 +1,4 @@ Original C library created by Pieter Geelen. Work on Java version of the Mapcode library by Rijn Buve (original port by Matthew Lowden). -Copyright (C) 2014-2016, Stichting Mapcode Foundation (http://www.mapcode.com) +Copyright (C) 2014-2019, Stichting Mapcode Foundation (http://www.mapcode.com) diff --git a/README.md b/README.md index 421b8e8..60a8e11 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ [![Build Status](https://img.shields.io/travis/mapcode-foundation/mapcode-java-example.svg?maxAge=3600&branch=master)](https://travis-ci.org/mapcode-foundation/mapcode-java-example) [![License](http://img.shields.io/badge/license-APACHE2-blue.svg)]() -**Copyright (C) 2014-2017 Stichting Mapcode Foundation (http://www.mapcode.com)** +**Copyright (C) 2014-2019, Stichting Mapcode Foundation (http://www.mapcode.com)** This Java project contains example code of how to use the Mapcode Library. diff --git a/pom.xml b/pom.xml index 4422bc5..987b908 100644 --- a/pom.xml +++ b/pom.xml @@ -27,10 +27,10 @@ 1.6 - 3.5.1 + 3.8.0 - 2.4.7 + 2.4.8 1.2.17 1.7.25 diff --git a/src/main/java/com/mapcode/example/Example.java b/src/main/java/com/mapcode/example/Example.java index c6058b0..fde2036 100644 --- a/src/main/java/com/mapcode/example/Example.java +++ b/src/main/java/com/mapcode/example/Example.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2014-2016, Stichting Mapcode Foundation (http://www.mapcode.com) + * Copyright (C) 2014-2019, Stichting Mapcode Foundation (http://www.mapcode.com) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/resources/log4j.xml b/src/main/resources/log4j.xml index c8c65e1..8a33f3b 100644 --- a/src/main/resources/log4j.xml +++ b/src/main/resources/log4j.xml @@ -1,6 +1,6 @@ - 2.4.8 + 2.4.10 1.2.17 1.7.25 From 55dd30f1722c19fe047cdf04bed8865bd6cd951e Mon Sep 17 00:00:00 2001 From: Rijn Buve Date: Wed, 10 Jul 2019 16:09:43 +0200 Subject: [PATCH 17/25] Updated Mapcode library --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 87a1c95..c9532cb 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.mapcode mapcode-example jar - 2.4.10.1 + 2.4.11.1 Mapcode Java Example @@ -30,7 +30,7 @@ 3.8.0 - 2.4.10 + 2.4.11 1.2.17 1.7.25 From 6344e3e42e48b06c990b5d162f6d22b49122e501 Mon Sep 17 00:00:00 2001 From: Rijn Buve Date: Thu, 11 Jul 2019 17:59:23 +0200 Subject: [PATCH 18/25] Updated Mapcode dependency --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index c9532cb..dfce5c5 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.mapcode mapcode-example jar - 2.4.11.1 + 2.4.12.1 Mapcode Java Example @@ -30,7 +30,7 @@ 3.8.0 - 2.4.11 + 2.4.12 1.2.17 1.7.25 From c466c68e0c1b50d320575dc57ad55ad8e5e1a802 Mon Sep 17 00:00:00 2001 From: Rijn Buve Date: Tue, 21 Apr 2020 17:15:29 +0200 Subject: [PATCH 19/25] Updated dependencies --- pom.xml | 20 +++++++++++-- .../java/com/mapcode/example/Example.java | 4 +-- src/main/resources/log4j.xml | 28 +++++++++---------- 3 files changed, 34 insertions(+), 18 deletions(-) diff --git a/pom.xml b/pom.xml index dfce5c5..b6fe7b9 100644 --- a/pom.xml +++ b/pom.xml @@ -1,3 +1,19 @@ + + + ~ Copyright (C) 2016-2020, Stichting Mapcode Foundation (http://www.mapcode.com) + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> From e0779266900debafdbd45f233eef1d773a765330 Mon Sep 17 00:00:00 2001 From: Rijn Buve Date: Sat, 18 Dec 2021 15:49:30 +0100 Subject: [PATCH 20/25] Updated dependencies log4j --- pom.xml | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index b6fe7b9..8803fb0 100644 --- a/pom.xml +++ b/pom.xml @@ -46,9 +46,9 @@ 3.8.0 - 2.4.14 - 1.2.17 - 1.7.25 + 2.4.16 + 2.17.0 + 1.7.30 @@ -75,8 +75,14 @@ - log4j - log4j + org.apache.logging.log4j + log4j-api + ${log4j.version} + + + + org.apache.logging.log4j + log4j-core ${log4j.version} From 2ace7247fc82d13fb9125d7c63389bf275e1dd49 Mon Sep 17 00:00:00 2001 From: Rijn Buve Date: Sat, 18 Dec 2021 15:49:54 +0100 Subject: [PATCH 21/25] Updated dependencies log4j --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8803fb0..56d5088 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ com.mapcode mapcode-example jar - 2.4.14.0 + 2.4.16.0 Mapcode Java Example From 1de4cac97b98b80e5be007ca36e6146445104dc4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 4 Jan 2022 16:54:47 +0000 Subject: [PATCH 22/25] Bump log4j-api from 2.17.0 to 2.17.1 Bumps log4j-api from 2.17.0 to 2.17.1. --- updated-dependencies: - dependency-name: org.apache.logging.log4j:log4j-api dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 56d5088..0b5a2ad 100644 --- a/pom.xml +++ b/pom.xml @@ -47,7 +47,7 @@ 2.4.16 - 2.17.0 + 2.17.1 1.7.30 From 81f34f6b422f9b0cf7ae668157b119b9043ad3bd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 4 Jan 2022 16:57:57 +0000 Subject: [PATCH 23/25] Bump log4j-core from 2.17.0 to 2.17.1 Bumps log4j-core from 2.17.0 to 2.17.1. --- updated-dependencies: - dependency-name: org.apache.logging.log4j:log4j-core dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 56d5088..0b5a2ad 100644 --- a/pom.xml +++ b/pom.xml @@ -47,7 +47,7 @@ 2.4.16 - 2.17.0 + 2.17.1 1.7.30 From 8e580d9a832d0dd5f0dc31e55540cf2c7dfefaef Mon Sep 17 00:00:00 2001 From: Rijn Buve Date: Thu, 6 Jan 2022 09:35:36 +0100 Subject: [PATCH 24/25] Updated dependencies --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 0b5a2ad..5f916c4 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ com.mapcode mapcode-example jar - 2.4.16.0 + 2.4.17.0 Mapcode Java Example @@ -46,7 +46,7 @@ 3.8.0 - 2.4.16 + 2.4.17 2.17.1 1.7.30 From 076e7b742bd6d3a5066afe3b573d263da89a60a0 Mon Sep 17 00:00:00 2001 From: Rijn Buve Date: Mon, 25 Apr 2022 15:41:03 +0200 Subject: [PATCH 25/25] Update dependencies --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 5f916c4..fe8518c 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ com.mapcode mapcode-example jar - 2.4.17.0 + 2.4.18.0 Mapcode Java Example @@ -46,9 +46,9 @@ 3.8.0 - 2.4.17 - 2.17.1 - 1.7.30 + 2.4.18 + 2.17.2 + 1.7.36