You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by en...@apache.org on 2021/06/14 20:12:02 UTC
[sling-org-apache-sling-servlets-resolver] branch master updated:
SLING-10487 rollback usage of jacoco command
This is an automated email from the ASF dual-hosted git repository.
enorman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-servlets-resolver.git
The following commit(s) were added to refs/heads/master by this push:
new 47a565b SLING-10487 rollback usage of jacoco command
47a565b is described below
commit 47a565b9fa51c8c66c72e936bd85e38d313bdb67
Author: Eric Norman <en...@apache.org>
AuthorDate: Mon Jun 14 13:11:52 2021 -0700
SLING-10487 rollback usage of jacoco command
To fix the ci build
---
.../apache/sling/servlets/resolver/it/ServletResolverTestSupport.java | 4 ----
1 file changed, 4 deletions(-)
diff --git a/src/test/java/org/apache/sling/servlets/resolver/it/ServletResolverTestSupport.java b/src/test/java/org/apache/sling/servlets/resolver/it/ServletResolverTestSupport.java
index 780e135..2ec221d 100644
--- a/src/test/java/org/apache/sling/servlets/resolver/it/ServletResolverTestSupport.java
+++ b/src/test/java/org/apache/sling/servlets/resolver/it/ServletResolverTestSupport.java
@@ -73,7 +73,6 @@ public class ServletResolverTestSupport extends TestSupport {
public Option[] configuration() {
final String debugPort = System.getProperty("debugPort");
final String vmOpt = System.getProperty("pax.vm.options");
- final String jacocoOpt = System.getProperty("jacoco.command");
final int httpPort = findFreePort();
versionResolver.setVersionFromProject("org.apache.sling", "org.apache.sling.api");
@@ -89,9 +88,6 @@ public class ServletResolverTestSupport extends TestSupport {
when(vmOpt != null).useOptions(
vmOption(vmOpt)
),
- when(jacocoOpt != null).useOptions(
- vmOption(jacocoOpt)
- ),
baseConfiguration(),
slingServlets(),
mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.converter").version("1.0.12"), // new Sling API dependency