This is an automated email from the ASF dual-hosted git repository.
radu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-whiteboard.git
The following commit(s) were added to refs/heads/master by this push:
new 5345eae reconfigured code coverage setup
5345eae is described below
commit 5345eae5c47c1a8c7ce5ae0e027281684a65a792
Author: Radu Cotescu <[email protected]>
AuthorDate: Mon Oct 1 20:04:55 2018 +0200
reconfigured code coverage setup
---
.../org-apache-sling-scripting-resolver-it/pom.xml | 50 +++++++++++++++-------
.../org-apache-sling-scripting-resolver/pom.xml | 29 ++++++++++---
.../src/test/provisioning/it-model.txt | 35 ---------------
scripting-resolver/pom.xml | 5 +++
4 files changed, 64 insertions(+), 55 deletions(-)
diff --git a/scripting-resolver/org-apache-sling-scripting-resolver-it/pom.xml
b/scripting-resolver/org-apache-sling-scripting-resolver-it/pom.xml
index 6e36856..d3353d5 100644
--- a/scripting-resolver/org-apache-sling-scripting-resolver-it/pom.xml
+++ b/scripting-resolver/org-apache-sling-scripting-resolver-it/pom.xml
@@ -32,11 +32,6 @@
<version>0.0.1-SNAPSHOT</version>
<packaging>slingstart</packaging>
- <properties>
- <sling.java.version>8</sling.java.version>
- <jacoco.maven.plugin.version>0.8.1</jacoco.maven.plugin.version>
- </properties>
-
<build>
<plugins>
<plugin>
@@ -63,33 +58,32 @@
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.scripting.sightly</artifactId>
<version>1.0.55-1.4.0-exp-SNAPSHOT</version>
- <scope>provided</scope>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.scripting.examplebundle</artifactId>
<version>0.0.1-SNAPSHOT</version>
- <scope>provided</scope>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.scripting.examplebundle.precompiled</artifactId>
<version>0.0.1-SNAPSHOT</version>
- <scope>provided</scope>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.scripting.examplebundle.classic</artifactId>
<version>0.0.1-SNAPSHOT</version>
- <scope>provided</scope>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.scripting.examplebundle.hi</artifactId>
<version>0.0.1-SNAPSHOT</version>
- <scope>provided</scope>
+ <scope>test</scope>
</dependency>
- <!-- TESTING -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -107,7 +101,6 @@
<version>1.1.12</version>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>
@@ -183,6 +176,35 @@
</configuration>
</plugin>
<plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ <version>${jacoco.maven.plugin.version}</version>
+ <executions>
+ <execution>
+ <id>prepare-agent-integration</id>
+ <goals>
+ <goal>prepare-agent-integration</goal>
+ </goals>
+ <configuration>
+ <propertyName>jacoco.agent</propertyName>
+ </configuration>
+ </execution>
+ <execution>
+ <id>aggregate-coverage-information</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>report-aggregate</goal>
+ </goals>
+ <configuration>
+ <title>Apache Sling Scripting
Resolver</title>
+ <includes>
+
<include>**/org/apache/sling/scripting/resolver/**/*.class</include>
+ </includes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<!-- the Sling instance is provisioned from the model
in src/test/provisioning/it-model.txt -->
<groupId>org.apache.sling</groupId>
<artifactId>slingstart-maven-plugin</artifactId>
@@ -218,13 +240,11 @@
<configuration>
<usePomDependencies>true</usePomDependencies>
<attachArtifact>false</attachArtifact>
- <!--
<shouldBlockUntilKeyIsPressed>true</shouldBlockUntilKeyIsPressed> -->
<servers>
<server>
<id>testinstance</id>
<port>${http.port.testing}</port>
- <vmOpts>${sling.vm.options}</vmOpts>
- <debug>${jacoco.agent}</debug>
+ <vmOpts>${sling.vm.options}
${jacoco.agent}</vmOpts>
</server>
</servers>
</configuration>
diff --git a/scripting-resolver/org-apache-sling-scripting-resolver/pom.xml
b/scripting-resolver/org-apache-sling-scripting-resolver/pom.xml
index e8552a3..e135123 100644
--- a/scripting-resolver/org-apache-sling-scripting-resolver/pom.xml
+++ b/scripting-resolver/org-apache-sling-scripting-resolver/pom.xml
@@ -32,11 +32,6 @@
<version>0.0.1-SNAPSHOT</version>
<packaging>bundle</packaging>
- <properties>
- <sling.java.version>8</sling.java.version>
- <jacoco.maven.plugin.version>0.8.1</jacoco.maven.plugin.version>
- </properties>
-
<build>
<plugins>
<plugin>
@@ -74,6 +69,30 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <argLine>@{argLine}</argLine>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ <version>${jacoco.maven.plugin.version}</version>
+ <executions>
+ <execution>
+ <id>prepare-agent</id>
+ <goals>
+ <goal>prepare-agent</goal>
+ </goals>
+ <configuration>
+
<destFile>${project.build.directory}/jacoco-unit.exec</destFile>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
diff --git
a/scripting-resolver/org-apache-sling-scripting-resolver/src/test/provisioning/it-model.txt
b/scripting-resolver/org-apache-sling-scripting-resolver/src/test/provisioning/it-model.txt
deleted file mode 100644
index ce8b311..0000000
---
a/scripting-resolver/org-apache-sling-scripting-resolver/src/test/provisioning/it-model.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-[feature name=scripting-resolver-it]
-
-# Dependencies
-[artifacts]
- org.apache.sling/org.apache.sling.starter/11-SNAPSHOT/slingstart
- org.apache.sling/org.apache.sling.scripting.sightly/1.0.55-1.4.0-exp-SNAPSHOT
- org.apache.sling/org.apache.sling.scripting.resolver
- org.apache.sling/org.apache.sling.scripting.examplebundle
- org.apache.sling/org.apache.sling.scripting.examplebundle.precompiled
- org.apache.sling/org.apache.sling.scripting.examplebundle.classic
- org.apache.sling/org.apache.sling.scripting.examplebundle.hi
- org.apache.sling/org.apache.sling.junit.core/1.0.26
-
-[configurations]
- org.apache.sling.engine.impl.SlingMainServlet
- sling.trace.allow=B"true"
diff --git a/scripting-resolver/pom.xml b/scripting-resolver/pom.xml
index 4ff5f58..496f33a 100644
--- a/scripting-resolver/pom.xml
+++ b/scripting-resolver/pom.xml
@@ -34,6 +34,11 @@
<name>Apache Sling Scripting Resolver Reactor</name>
+ <properties>
+ <sling.java.version>8</sling.java.version>
+ <jacoco.maven.plugin.version>0.8.1</jacoco.maven.plugin.version>
+ </properties>
+
<modules>
<module>org-apache-sling-scripting-maven-plugin</module>
<module>examples/org-apache-sling-scripting-examplebundle</module>
