This is an automated email from the ASF dual-hosted git repository.
bchapuis pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-baremaps.git
The following commit(s) were added to refs/heads/main by this push:
new 165104b6 Scope CLI version.txt resource file to specific package (#689)
165104b6 is described below
commit 165104b67d430d154e3844e17194e87aa3faaad0
Author: Perdjesk <[email protected]>
AuthorDate: Mon Jun 5 16:36:18 2023 +0200
Scope CLI version.txt resource file to specific package (#689)
* Scope CLI version.txt resource file to specific package to avoid
conflicts with multiple jars on classpath
---
baremaps-cli/src/main/java/org/apache/baremaps/cli/Baremaps.java | 2 +-
.../src/main/resources/{ => org/apache/baremaps/cli}/version.txt | 0
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/baremaps-cli/src/main/java/org/apache/baremaps/cli/Baremaps.java
b/baremaps-cli/src/main/java/org/apache/baremaps/cli/Baremaps.java
index b792f068..d60e5bd5 100644
--- a/baremaps-cli/src/main/java/org/apache/baremaps/cli/Baremaps.java
+++ b/baremaps-cli/src/main/java/org/apache/baremaps/cli/Baremaps.java
@@ -86,7 +86,7 @@ public class Baremaps implements Callable<Integer> {
static class VersionProvider implements IVersionProvider {
public String[] getVersion() throws Exception {
- URL url = getClass().getResource("/version.txt");
+ URL url = Baremaps.class.getResource("version.txt");
if (url == null) {
return new String[] {"No version.txt file found in the classpath."};
}
diff --git a/baremaps-cli/src/main/resources/version.txt
b/baremaps-cli/src/main/resources/org/apache/baremaps/cli/version.txt
similarity index 100%
rename from baremaps-cli/src/main/resources/version.txt
rename to baremaps-cli/src/main/resources/org/apache/baremaps/cli/version.txt
