You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by da...@apache.org on 2020/07/17 10:07:57 UTC
[sling-org-apache-sling-feature-extension-apiregions] branch master
updated: Update launcher dependency to latest version
This is an automated email from the ASF dual-hosted git repository.
davidb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-extension-apiregions.git
The following commit(s) were added to refs/heads/master by this push:
new c997fcb Update launcher dependency to latest version
c997fcb is described below
commit c997fcba870005235888f666d4ef48291aaf8c9b
Author: David Bosschaert <bo...@adobe.com>
AuthorDate: Fri Jul 17 11:07:39 2020 +0100
Update launcher dependency to latest version
---
pom.xml | 2 +-
.../apiregions/analyser/AbstractApiRegionsAnalyserTaskTest.java | 6 ++++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index c1ad9f2..cb052cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -74,7 +74,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.feature.launcher</artifactId>
- <version>1.1.2</version>
+ <version>1.1.4</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/src/test/java/org/apache/sling/feature/extension/apiregions/analyser/AbstractApiRegionsAnalyserTaskTest.java b/src/test/java/org/apache/sling/feature/extension/apiregions/analyser/AbstractApiRegionsAnalyserTaskTest.java
index e8decf5..ecee258 100644
--- a/src/test/java/org/apache/sling/feature/extension/apiregions/analyser/AbstractApiRegionsAnalyserTaskTest.java
+++ b/src/test/java/org/apache/sling/feature/extension/apiregions/analyser/AbstractApiRegionsAnalyserTaskTest.java
@@ -28,6 +28,7 @@ import javax.json.JsonArray;
import javax.json.JsonReader;
import javax.json.stream.JsonParsingException;
+import org.apache.johnzon.core.JsonReaderImpl.NothingToRead;
import org.apache.sling.feature.Artifact;
import org.apache.sling.feature.ArtifactId;
import org.apache.sling.feature.Extension;
@@ -45,6 +46,7 @@ import org.junit.Test;
import org.mockito.Mockito;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
+
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.mockito.ArgumentMatchers.anyString;
@@ -102,8 +104,8 @@ public abstract class AbstractApiRegionsAnalyserTaskTest<T extends AbstractApiRe
JsonArray array = null;
try {
array = reader.readArray();
- } catch (final JsonParsingException ignore) {
-
+ } catch (final JsonParsingException | NothingToRead ignore) {
+ // ignored
}
when(extension.getJSONStructure()).thenReturn(array);
}