Skip to content

Commit 338a0cf

Browse files
authored
Merge pull request #11 from OpenCageData/release/v2.0.0
Release/v2.0.0
2 parents 09767c0 + 62e9e81 commit 338a0cf

File tree

9 files changed

+90
-51
lines changed

9 files changed

+90
-51
lines changed

.github/CONTRIBUTING.md

Lines changed: 30 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,56 @@
1-
21
# Contributing
32

4-
I'm happy to accept external contributions to the project in the form of feedback,
3+
We are happy to accept external contributions to the project in the form of feedback,
54
bug reports and even better - pull requests
65

76
## Issues
87

9-
Issues are mostly used to track **bugs** and **feature requests** but you can also
8+
Issues are mostly used to track **bugs** and **feature requests** but you can also
109
ask questions as it's the only place I'm looking at.
1110

1211
Before reporting a bug or requesting a feature, run a few searches to
1312
see if a similar issue has already been opened and ensure you’re not submitting
1413
a duplicate.
1514

1615
### Bugs
17-
* Choose the "Bug Report" template
18-
* Fill in all relevant information, especially
19-
* Describe steps to reproduce
20-
* Full error message if any
21-
* Your code if relevant
16+
17+
- Choose the "Bug Report" template
18+
- Fill in all relevant information, especially
19+
- Describe steps to reproduce
20+
- Full error message if any
21+
- Your code if relevant
2222

2323
### Feature Requests
24-
* Choose the "Feature Request" template
25-
* Describe the feature. Be specific
26-
* Explain why I should implement it.
24+
25+
- Choose the "Feature Request" template
26+
- Describe the feature. Be specific
27+
- Explain why I should implement it.
2728

2829
## Pull Request Guidelines
29-
* Please check to make sure that there aren't existing pull requests attempting to address the issue mentioned.
30-
* Open a single PR for each subject.
31-
* Develop in a topic branch, not master (feature-name).
32-
* Write a convincing description of your PR and why I should land it.
33-
* Update documentation comments where applicable.
30+
31+
- Please check to make sure that there aren't existing pull requests attempting to address the issue mentioned.
32+
- Open a single PR for each subject.
33+
- Develop in a topic branch, not master (feature-name).
34+
- Write a convincing description of your PR and why I should land it.
35+
- Update documentation comments where applicable.
3436

3537
### Only touch relevant files
3638

37-
* Make sure your PR stays focused on a single feature.
38-
* Don't change project configs or any files unrelated to the subject you're working.
39-
* Don't reformat code you don't modify.
39+
- Make sure your PR stays focused on a single feature.
40+
- Don't change project configs or any files unrelated to the subject you're working.
41+
- Don't reformat code you don't modify.
4042

4143
### Fixing a bug?
42-
* Mention it or create an issue if not exist
43-
* Do not forgot to put [Fix # in your commit message to auto close](https://help.github.com/articles/closing-issues-via-commit-messages/)
44+
45+
- Mention it or create an issue if not exist
46+
- Do not forgot to put [Fix # in your commit message to auto close](https://help.github.com/articles/closing-issues-via-commit-messages/)
4447

4548
### Keep your commit history short and clean.
46-
* Keeping the history clean means making one commit per feature. (no fix of your fix)
47-
* I will squash every PR.
49+
50+
- Keeping the history clean means making one commit per feature. (no fix of your fix)
51+
- We may squash your PR.
4852

4953
### Make sure tests pass (if exist)
50-
* Add relevant tests to cover the change.
51-
* Make sure test-suite passes.
54+
55+
- Add relevant tests to cover the change.
56+
- Make sure test-suite passes.

.github/ISSUE_TEMPLATE/-everything-else--report.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ about: Use this if it's NOT a bug or feature request
44
title: ''
55
labels: ''
66
assignees: ''
7-
87
---
98

109
<!--
@@ -14,10 +13,12 @@ ATTENTION: Only issues using a filled template will be accepted!
1413
### Description
1514

1615
### Library version:
16+
1717
<!-- Please remove all items that are not relevant. -->
1818

19+
- 2.0.0
20+
- 1.4.1
1921
- 1.4.0
2022
- 1.3.0
2123
- 1.2.1
2224
- other: (Please fill in the version you are using.)
23-

.github/ISSUE_TEMPLATE/bug-report.md

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,25 @@ about: Template to report bugs.
44
title: 'Bug: '
55
labels: ''
66
assignees: ''
7-
87
---
98

109
<!--
1110
ATTENTION: Only issues using a filled template will be accepted!
1211
-->
1312

1413
### Library version:
14+
1515
<!-- Please remove all items that are not relevant. -->
1616

17+
- 2.0.0
18+
- 1.4.1
1719
- 1.4.0
1820
- 1.3.0
1921
- 1.2.1
2022
- other: (Please fill in the version you are using.)
2123

2224
### Current Behavior
25+
2326
<!-- Describe the bug. Be specific. I need to understand you problem. -->
2427

2528
Your code
@@ -35,16 +38,17 @@ Add here
3538
```
3639

3740
### Expected Behavior
38-
<!-- Describe what the behavior would be without the bug. -->
3941

42+
<!-- Describe what the behavior would be without the bug. -->
4043

4144
### Sample Code or Sample Application Repo
42-
<!-- If you are able to illustrate the bug or feature request with an example, please provide sample code snippets or a sample application via a public repo. -->
4345

46+
<!-- If you are able to illustrate the bug or feature request with an example, please provide sample code snippets or a sample application via a public repo. -->
4447

4548
### Reproduction Steps
46-
<!-- Please explain the steps required to duplicate the issue, especially if you are able to provide a sample application. -->
4749

50+
<!-- Please explain the steps required to duplicate the issue, especially if you are able to provide a sample application. -->
4851

4952
### Other Information
53+
5054
<!-- List any other information that is relevant to your issue. Stack traces, related issues, suggestions on how to fix, Stack Overflow links, forum links, etc. -->

.github/ISSUE_TEMPLATE/feature-request.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,28 @@ about: Request a feature addition or change.
44
title: 'Feat: '
55
labels: ''
66
assignees: ''
7-
87
---
98

109
<!--
1110
ATTENTION: Only issues using a filled template will be accepted!
1211
-->
1312

1413
### Describe the Feature
14+
1515
<!-- A clear and concise description of what the feature request is. Please include if your feature request is related to a problem. -->
1616

1717
### Describe Preferred Solution
18+
1819
<!-- A clear and concise description of what you want to happen. -->
1920

2021
### Describe Alternatives
22+
2123
<!-- A clear and concise description of any alternative solutions or features you've considered. -->
2224

2325
### Related Code
26+
2427
<!-- If you are able to illustrate the feature request with an example, please provide a sample application via an online code collaborator such as [StackBlitz](https://stackblitz.com), or [GitHub](https://github.com). -->
2528

2629
### Additional Context
30+
2731
<!-- List any other information that is relevant to your issue. Stack traces, related issues, suggestions on how to add, use case, Stack Overflow links, forum links, screenshots, OS if applicable, etc. -->

.github/dependabot.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
version: 2
77
updates:
8-
- package-ecosystem: "gradle" # See documentation for possible values
9-
directory: "/" # Location of package manifests
8+
- package-ecosystem: 'gradle' # See documentation for possible values
9+
directory: '/' # Location of package manifests
1010
schedule:
11-
interval: "weekly"
11+
interval: 'weekly'

CHANGELOG.md

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased]
99

10+
## [2.0.0] - 2023-10-10
11+
12+
### Important
13+
14+
- OpenCage Data is now maintaining this package
15+
1016
## [1.4.1] - 2023-10-04
1117

1218
### Changed
@@ -18,9 +24,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1824

1925
### Fixed
2026

21-
- [@moberwasserlechner]: Decimal numbers with large scale are converted to String using the E notation, leading to incorrect results with reverse geocoding.
22-
- [@moberwasserlechner]: Coerce latitude/longitude to String preventing E notation [#44](https://github.com/moberwasserlechner/jopencage/issues/44) thx [@lpellegr](https://github.com/lpellegr)
23-
- [@moberwasserlechner]: Fixed SSL and AllowAllHostNameVerifier [#43](https://github.com/moberwasserlechner/jopencage/pull/43) thx [@damade](https://github.com/damade)
27+
- [@moberwasserlechner](https://github.com/moberwasserlechner): Decimal numbers with large scale are converted to String using the E notation, leading to incorrect results with reverse geocoding.
28+
- [@moberwasserlechner](https://github.com/moberwasserlechner): Coerce latitude/longitude to String preventing E notation [#44](https://github.com/moberwasserlechner/jopencage/issues/44) thx [@lpellegr](https://github.com/lpellegr)
29+
- [@moberwasserlechner](https://github.com/moberwasserlechner): Fixed SSL and AllowAllHostNameVerifier [#43](https://github.com/moberwasserlechner/jopencage/pull/43) thx [@damade](https://github.com/damade)
2430

2531
## [1.4.0] - 2021-04-18
2632

@@ -71,7 +77,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
7177

7278
- Bug fix bounds on forward request (#27)
7379

74-
[Unreleased]: https://github.com/moberwasserlechner/jopencage/compare/1.4.1...master
80+
[Unreleased]: https://github.com/OpenCageData/jopencage/compare/2.0.0...master
81+
[2.0.0]: https://github.com/moberwasserlechner/jopencage/compare/1.4.1...2.0.0
7582
[1.4.1]: https://github.com/moberwasserlechner/jopencage/compare/1.4.0...1.4.1
7683
[1.4.0]: https://github.com/moberwasserlechner/jopencage/compare/1.3.0...1.4.0
7784
[1.3.0]: https://github.com/moberwasserlechner/jopencage/compare/1.2.1...1.3.0

README.md

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,19 @@
33
[![Maven Central](https://img.shields.io/maven-central/v/com.opencagedata/jopencage.svg?label=Maven%20Central)](https://central.sonatype.com/artifact/com.opencagedata/jopencage)
44
[![UnitTests](https://github.com/OpenCageData/jopencage/actions/workflows/unit-tests.yml/badge.svg?branch=master)](https://github.com/OpenCageData/jopencage/actions)
55

6-
This api provides a java client to the OpenCage geocoding service. https://opencagedata.com/api
6+
This package provides a Java client to the OpenCage Geocoding API: https://opencagedata.com/api
7+
8+
## Tutorial
9+
10+
You can find a comprehensive tutorial for using this package [on the OpenCage site](https://opencagedata.com/tutorials/geocode-in-java).
11+
12+
## Getting started
13+
14+
Signup for a [free-trial API Key](https://opencagedata.com/users/sign_up).
715

816
## Usage
917

10-
Maven
18+
**Maven**
1119

1220
```xml
1321
<dependency>
@@ -17,7 +25,7 @@ Maven
1725
</dependency>
1826
```
1927

20-
Gradle
28+
**Gradle**
2129

2230
```gradle
2331
implementation "com.opencagedata:jopencage:REPLACE.WITH.VERSION"

build.gradle

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,19 @@ publishing {
5858
}
5959
developers {
6060
developer {
61+
id = 'OpenCageData'
62+
name = 'OpenCage Data'
63+
email = 'support@opencagedata.com'
64+
organizationUrl = 'https://opencagedata.com'
65+
roles = [ 'maintainer' ]
66+
}
67+
}
68+
contributors {
69+
contributor {
6170
id = 'moberwasserlechner'
6271
name = 'Michael Oberwasserlechner'
6372
email = 'm.oberwasserlechner@byteowls.com'
73+
roles = [ 'former maintainer']
6474
}
6575
}
6676
scm {
@@ -74,22 +84,22 @@ publishing {
7484
repositories {
7585
maven {
7686
// change URLs to point to your repos, e.g. http://my.org/repo
77-
def releasesRepoUrl = "https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/"
78-
def snapshotsRepoUrl = "https://s01.oss.sonatype.org/content/repositories/snapshots/"
87+
def releasesRepoUrl = "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
88+
def snapshotsRepoUrl = "https://oss.sonatype.org/content/repositories/snapshots/"
7989
url = version.endsWith('SNAPSHOT') ? snapshotsRepoUrl : releasesRepoUrl
8090
credentials {
81-
username = project.findProperty("MAVEN_CENTRAL_USERNAME") ?: System.getenv("MAVEN_CENTRAL_USERNAME")
82-
password = project.findProperty("MAVEN_CENTRAL_PASSWORD") ?: System.getenv("MAVEN_CENTRAL_PASSWORD")
91+
username = project.findProperty("MAVEN_USERNAME") ?: System.getenv("MAVEN_USERNAME")
92+
password = project.findProperty("MAVEN_PASSWORD") ?: System.getenv("MAVEN_PASSWORD")
8393
}
8494
}
8595
}
8696
}
8797

8898
signing {
89-
// def signingKeyId = (String) project.findProperty("MAVEN_SIGNING_KEY_ID") ?: System.getenv("MAVEN_SIGNING_KEY_ID")
90-
// def signingKey = (String) project.findProperty("MAVEN_SIGNING_KEY") ?: System.getenv("MAVEN_SIGNING_KEY")
91-
// def signingPassword = (String) project.findProperty("MAVEN_SIGNING_PASSWORD") ?: System.getenv("MAVEN_SIGNING_PASSWORD")
92-
// useInMemoryPgpKeys(signingKeyId, signingKey, signingPassword)
99+
// def signingKeyId = (String) project.findProperty("OSSRH_GPG_SIGNING_KEY_ID") ?: System.getenv("OSSRH_GPG_SIGNING_KEY_ID")
100+
// def signingKey = (String) project.findProperty("OSSRH_GPG_SECRET_KEY") ?: System.getenv("OSSRH_GPG_SECRET_KEY")
101+
// def signingPassword = (String) project.findProperty("OSSRH_GPG_SECRET_KEY_PASSWORD") ?: System.getenv("OSSRH_GPG_SECRET_KEY_PASSWORD")
102+
// useInMemoryPgpKeys(signingKeyId, signingKey, signingPassword)
93103
sign publishing.publications.mavenJava
94104
}
95105

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
group=com.opencagedata
22
artifactId=jopencage
3-
version=1.4.1
3+
version=2.0.0
44

55
# slf4jVersion=1.7.32
66
httpClientVersion=5.2.1

0 commit comments

Comments
 (0)