sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject [sling-org-apache-sling-scripting-bundle-tracker-it] 02/07: reconfigured code coverage setup
Date Mon, 10 Dec 2018 15:37:55 GMT
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-org-apache-sling-scripting-bundle-tracker-it.git

commit ae866b094b2f50c00db330ff382557d809f7e57d
Author: Radu Cotescu <radu@apache.org>
AuthorDate: Mon Oct 1 20:04:55 2018 +0200

    reconfigured code coverage setup
---
 pom.xml | 50 +++++++++++++++++++++++++++++++++++---------------
 1 file changed, 35 insertions(+), 15 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6e36856..d3353d5 100644
--- a/pom.xml
+++ b/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>


Mime
View raw message