Skip to content

Commit

Permalink
Merge branch 'release-1.1.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
charphi committed Sep 25, 2020
2 parents c2c7633 + f55ecd9 commit 7e8325b
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 9 deletions.
17 changes: 9 additions & 8 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>be.nbb.rd</groupId>
<artifactId>java-console-properties</artifactId>
<version>1.1.1</version>
<version>1.1.2</version>

<packaging>jar</packaging>

Expand All @@ -29,7 +29,7 @@
<dependency>
<groupId>org.checkerframework</groupId>
<artifactId>checker-qual</artifactId>
<version>3.6.0</version>
<version>3.6.1</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand All @@ -53,7 +53,7 @@
<dependency>
<groupId>info.picocli</groupId>
<artifactId>picocli</artifactId>
<version>4.5.0</version>
<version>4.5.1</version>
<optional>true</optional>
</dependency>
<dependency>
Expand All @@ -65,13 +65,13 @@
<dependency>
<groupId>be.nbb.rd</groupId>
<artifactId>java-io-base</artifactId>
<version>0.0.6</version>
<version>0.0.7</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>1.26</version>
<version>1.27</version>
<optional>true</optional>
</dependency>

Expand All @@ -85,7 +85,7 @@
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.16.1</version>
<version>3.17.2</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down Expand Up @@ -321,13 +321,14 @@
<property>
<name>!skipEnforceCodeCoverage</name>
</property>
<jdk>(,11]</jdk>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.5</version>
<version>0.8.6</version>
<executions>
<execution>
<goals>
Expand Down Expand Up @@ -423,4 +424,4 @@
</snapshots>
</repository>
</repositories>
</project>
</project>
2 changes: 1 addition & 1 deletion src/main/java/nbbrd/console/picocli/ConfigHelper.java
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ private Path getConfigFile(Scope scope) {
switch (scope) {
case SYSTEM: {
Path sibling = selectMainJar(system.getClassPath());
return sibling != null ? sibling.getParent().resolve(getConfigFileName()) : null;
return sibling != null ? sibling.toAbsolutePath().getParent().resolve(getConfigFileName()) : null;
}
case GLOBAL: {
Path parent = system.getUserHome();
Expand Down

0 comments on commit 7e8325b

Please sign in to comment.