You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2021/06/21 21:15:48 UTC
[sling-org-apache-sling-clam] branch master updated (69d9f0c ->
86ab60a)
This is an automated email from the ASF dual-hosted git repository.
olli pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-clam.git.
from 69d9f0c SLING-10343 Update Testcontainers to fix build
new 991ba9d SLING-9699 Enable code coverage with JaCoCo
new 86ab60a update test dependencies
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pom.xml | 45 ++++------------------
.../sling/clam/it/tests/ClamTestSupport.java | 13 ++++++-
2 files changed, 20 insertions(+), 38 deletions(-)
[sling-org-apache-sling-clam] 02/02: update test dependencies
Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
olli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-clam.git
commit 86ab60a9f54c68cdaf056294d4e31b593908f6bd
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Mon Jun 21 22:40:33 2021 +0200
update test dependencies
---
pom.xml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/pom.xml b/pom.xml
index debbc27..10fcde1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -138,7 +138,7 @@
<dependency>
<groupId>com.launchdarkly</groupId>
<artifactId>okhttp-eventsource</artifactId>
- <version>1.10.0</version>
+ <version>1.11.2</version>
<scope>test</scope>
</dependency>
<!-- OSGi -->
@@ -307,13 +307,13 @@
<dependency>
<groupId>io.rest-assured</groupId>
<artifactId>rest-assured</artifactId>
- <version>4.3.0</version>
+ <version>4.4.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
- <version>4.0.2</version>
+ <version>4.1.0</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -368,13 +368,13 @@
<dependency>
<groupId>com.google.truth</groupId>
<artifactId>truth</artifactId>
- <version>1.0</version>
+ <version>1.1.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>28.1-jre</version>
+ <version>30.1.1-jre</version>
<scope>test</scope>
</dependency>
<dependency>
[sling-org-apache-sling-clam] 01/02: SLING-9699 Enable code
coverage with JaCoCo
Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
olli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-clam.git
commit 991ba9db0b88898b8ff446a91c8267dd7e614e7a
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Mon Jun 21 22:37:40 2021 +0200
SLING-9699 Enable code coverage with JaCoCo
inherit system properties from parent and check command
---
pom.xml | 35 ++--------------------
.../sling/clam/it/tests/ClamTestSupport.java | 13 +++++++-
2 files changed, 15 insertions(+), 33 deletions(-)
diff --git a/pom.xml b/pom.xml
index d15d2ca..debbc27 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,40 +85,11 @@
</executions>
<configuration>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
- <systemProperties>
- <property>
- <name>bundle.filename</name>
- <value>${basedir}/target/${project.build.finalName}.jar</value>
- </property>
- <property>
- <name>jacoco.command</name>
- <value>${jacoco.command}</value>
- </property>
- </systemProperties>
+ <systemPropertyVariables combine.children="append">
+ <bundle.filename>${basedir}/target/${project.build.finalName}.jar</bundle.filename>
+ </systemPropertyVariables>
</configuration>
</plugin>
- <plugin>
- <groupId>org.jacoco</groupId>
- <artifactId>jacoco-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>prepare-agent</id>
- <configuration>
- <propertyName>jacoco.command</propertyName>
- </configuration>
- <goals>
- <goal>prepare-agent</goal>
- </goals>
- </execution>
- <execution>
- <id>report</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>report</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
diff --git a/src/test/java/org/apache/sling/clam/it/tests/ClamTestSupport.java b/src/test/java/org/apache/sling/clam/it/tests/ClamTestSupport.java
index 3ca1ce9..bd15523 100644
--- a/src/test/java/org/apache/sling/clam/it/tests/ClamTestSupport.java
+++ b/src/test/java/org/apache/sling/clam/it/tests/ClamTestSupport.java
@@ -19,6 +19,7 @@
package org.apache.sling.clam.it.tests;
import java.util.Collections;
+import java.util.Objects;
import java.util.regex.Pattern;
import javax.inject.Inject;
@@ -35,6 +36,8 @@ import org.apache.sling.jcr.api.SlingRepository;
import org.apache.sling.testing.paxexam.TestSupport;
import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.options.ModifiableCompositeOption;
+import org.ops4j.pax.exam.options.OptionalCompositeOption;
+import org.ops4j.pax.exam.options.extra.VMOption;
import org.osgi.framework.BundleContext;
import static org.apache.sling.testing.paxexam.SlingOptions.awaitility;
@@ -47,6 +50,7 @@ import static org.ops4j.pax.exam.CoreOptions.composite;
import static org.ops4j.pax.exam.CoreOptions.junitBundles;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
import static org.ops4j.pax.exam.CoreOptions.vmOption;
+import static org.ops4j.pax.exam.CoreOptions.when;
import static org.ops4j.pax.exam.CoreOptions.wrappedBundle;
import static org.ops4j.pax.exam.cm.ConfigurationAdminOptions.factoryConfiguration;
import static org.ops4j.pax.exam.cm.ConfigurationAdminOptions.newConfiguration;
@@ -96,10 +100,17 @@ public abstract class ClamTestSupport extends TestSupport {
awaitility(),
restassured(),
testcontainers(),
- vmOption(System.getProperty("jacoco.command"))
+ jacoco() // remove with Testing PaxExam 4.0
);
}
+ // remove with Testing PaxExam 4.0
+ protected OptionalCompositeOption jacoco() {
+ final String jacocoCommand = System.getProperty("jacoco.command");
+ final VMOption option = Objects.nonNull(jacocoCommand) && !jacocoCommand.trim().isEmpty() ? vmOption(jacocoCommand) : null;
+ return when(Objects.nonNull(option)).useOptions(option);
+ }
+
protected Option quickstart() {
final int httpPort = findFreePort();
final String workingDirectory = workingDirectory();