Return-Path: <commits-return-45776-archive-asf-public=cust-asf.ponee.io@sling.apache.org>
X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io
Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io
Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183])
	by cust-asf2.ponee.io (Postfix) with ESMTP id 1098C2004A1
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Thu, 24 Aug 2017 15:10:10 +0200 (CEST)
Received: by cust-asf.ponee.io (Postfix)
	id 0F318169FE2; Thu, 24 Aug 2017 13:10:10 +0000 (UTC)
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by cust-asf.ponee.io (Postfix) with SMTP id 39459169FE4
	for <archive-asf-public@cust-asf.ponee.io>; Thu, 24 Aug 2017 15:10:09 +0200 (CEST)
Received: (qmail 43387 invoked by uid 500); 24 Aug 2017 13:10:08 -0000
Mailing-List: contact commits-help@sling.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@sling.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@sling.apache.org>
List-Post: <mailto:commits@sling.apache.org>
List-Id: <commits.sling.apache.org>
Reply-To: dev@sling.apache.org
Delivered-To: mailing list commits@sling.apache.org
Received: (qmail 43377 invoked by uid 99); 24 Aug 2017 13:10:08 -0000
Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 24 Aug 2017 13:10:08 +0000
Received: from svn01-us-west.apache.org (localhost [127.0.0.1])
	by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id D4AF53A006D
	for <commits@sling.apache.org>; Thu, 24 Aug 2017 13:10:06 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1806038 - in /sling/trunk/bundles/scripting/sightly:
 compiler/pom.xml engine/pom.xml java-compiler/pom.xml testing/pom.xml
 testing/src/main/provisioning/model.txt
 testing/src/test/java/LaunchpadReadyIT.java
Date: Thu, 24 Aug 2017 13:10:03 -0000
To: commits@sling.apache.org
From: radu@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20170824131006.D4AF53A006D@svn01-us-west.apache.org>
archived-at: Thu, 24 Aug 2017 13:10:10 -0000

Author: radu
Date: Thu Aug 24 13:10:03 2017
New Revision: 1806038

URL: http://svn.apache.org/viewvc?rev=1806038&view=rev
Log:
SLING-7084 - Coverage report is not generated correctly for HTL modules

* switched to slingstart-maven-plugin 1.7.7-SNAPSHOT, until 1.7.8 is released
* updated JaCoCo version to 0.7.9
* based tests on released Apache Sling Launchpad 9
* increased LaunchpadReadyIT timeouts from 20 to 60 seconds

Modified:
    sling/trunk/bundles/scripting/sightly/compiler/pom.xml
    sling/trunk/bundles/scripting/sightly/engine/pom.xml
    sling/trunk/bundles/scripting/sightly/java-compiler/pom.xml
    sling/trunk/bundles/scripting/sightly/testing/pom.xml
    sling/trunk/bundles/scripting/sightly/testing/src/main/provisioning/model.txt
    sling/trunk/bundles/scripting/sightly/testing/src/test/java/LaunchpadReadyIT.java

Modified: sling/trunk/bundles/scripting/sightly/compiler/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/compiler/pom.xml?rev=1806038&r1=1806037&r2=1806038&view=diff
==============================================================================
--- sling/trunk/bundles/scripting/sightly/compiler/pom.xml (original)
+++ sling/trunk/bundles/scripting/sightly/compiler/pom.xml Thu Aug 24 13:10:03 2017
@@ -51,7 +51,7 @@
 
     <properties>
         <antlr.version>4.1</antlr.version>
-        <jacoco.maven.plugin.version>0.7.6.201602180812</jacoco.maven.plugin.version>
+        <jacoco.maven.plugin.version>0.7.9</jacoco.maven.plugin.version>
     </properties>
 
     <!-- ======================================================================= -->

Modified: sling/trunk/bundles/scripting/sightly/engine/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/engine/pom.xml?rev=1806038&r1=1806037&r2=1806038&view=diff
==============================================================================
--- sling/trunk/bundles/scripting/sightly/engine/pom.xml (original)
+++ sling/trunk/bundles/scripting/sightly/engine/pom.xml Thu Aug 24 13:10:03 2017
@@ -50,7 +50,7 @@
     </scm>
 
     <properties>
-        <jacoco.maven.plugin.version>0.7.6.201602180812</jacoco.maven.plugin.version>
+        <jacoco.maven.plugin.version>0.7.9</jacoco.maven.plugin.version>
     </properties>
 
     <!-- ======================================================================= -->

Modified: sling/trunk/bundles/scripting/sightly/java-compiler/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/java-compiler/pom.xml?rev=1806038&r1=1806037&r2=1806038&view=diff
==============================================================================
--- sling/trunk/bundles/scripting/sightly/java-compiler/pom.xml (original)
+++ sling/trunk/bundles/scripting/sightly/java-compiler/pom.xml Thu Aug 24 13:10:03 2017
@@ -48,7 +48,7 @@
     </scm>
 
     <properties>
-        <jacoco.maven.plugin.version>0.7.6.201602180812</jacoco.maven.plugin.version>
+        <jacoco.maven.plugin.version>0.7.9</jacoco.maven.plugin.version>
     </properties>
 
     <!-- ======================================================================= -->

Modified: sling/trunk/bundles/scripting/sightly/testing/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/testing/pom.xml?rev=1806038&r1=1806037&r2=1806038&view=diff
==============================================================================
--- sling/trunk/bundles/scripting/sightly/testing/pom.xml (original)
+++ sling/trunk/bundles/scripting/sightly/testing/pom.xml Thu Aug 24 13:10:03 2017
@@ -68,7 +68,7 @@
         -->
         <debug.options/>
 
-        <jacoco.maven.plugin.version>0.7.6.201602180812</jacoco.maven.plugin.version>
+        <jacoco.maven.plugin.version>0.7.9</jacoco.maven.plugin.version>
         <!-- HTL modules under test versions -->
         <org.apache.sling.scripting.sightly.compiler.version>1.0.11-SNAPSHOT</org.apache.sling.scripting.sightly.compiler.version>
         <org.apache.sling.scripting.sightly.compiler.java.version>1.0.11-SNAPSHOT</org.apache.sling.scripting.sightly.compiler.java.version>
@@ -148,7 +148,7 @@
             <plugin>
                 <groupId>org.apache.sling</groupId>
                 <artifactId>slingstart-maven-plugin</artifactId>
-                <version>1.7.0</version>
+                <version>1.7.7-SNAPSHOT</version>
                 <extensions>true</extensions>
                 <executions>
                     <execution>
@@ -203,6 +203,23 @@
             <build>
                 <plugins>
                     <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>build-helper-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <phase>generate-sources</phase>
+                                <goals>
+                                    <goal>add-source</goal>
+                                </goals>
+                                <configuration>
+                                    <sources>
+                                        <source>${project.build.directory}/generated-sources</source>
+                                    </sources>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-dependency-plugin</artifactId>
                         <version>2.10</version>
@@ -214,17 +231,19 @@
                                 org.apache.sling.scripting.sightly.js.provider,
                                 org.apache.sling.scripting.sightly.models.provider
                             </includeArtifactIds>
-                            <failOnMissingClassifierArtifact>true</failOnMissingClassifierArtifact>
+                            <transitive>false</transitive>
                         </configuration>
                         <executions>
                             <execution>
-                                <id>copy-compiled-classes</id>
+                                <id>copy-sources</id>
                                 <phase>generate-resources</phase>
                                 <goals>
                                     <goal>unpack-dependencies</goal>
                                 </goals>
                                 <configuration>
-                                    <outputDirectory>${project.build.directory}/classes</outputDirectory>
+                                    <classifier>sources</classifier>
+                                    <failOnMissingClassifierArtifact>true</failOnMissingClassifierArtifact>
+                                    <outputDirectory>${project.build.directory}/generated-sources</outputDirectory>
                                 </configuration>
                             </execution>
                         </executions>

Modified: sling/trunk/bundles/scripting/sightly/testing/src/main/provisioning/model.txt
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/testing/src/main/provisioning/model.txt?rev=1806038&r1=1806037&r2=1806038&view=diff
==============================================================================
--- sling/trunk/bundles/scripting/sightly/testing/src/main/provisioning/model.txt (original)
+++ sling/trunk/bundles/scripting/sightly/testing/src/main/provisioning/model.txt Thu Aug 24 13:10:03 2017
@@ -16,15 +16,11 @@
 #  specific language governing permissions and limitations
 #  under the License.
 #
-[feature name=oak]
-
-[variables]
-    oak.version=1.5.15
 
 [feature name=sling]
 # Dependencies
 [artifacts]
-  org.apache.sling/org.apache.sling.launchpad/9-SNAPSHOT/slingstart
+  org.apache.sling/org.apache.sling.launchpad/9/slingstart
   org.apache.sling/org.apache.sling.scripting.sightly.compiler
   org.apache.sling/org.apache.sling.scripting.sightly.compiler.java
   org.apache.sling/org.apache.sling.scripting.sightly

Modified: sling/trunk/bundles/scripting/sightly/testing/src/test/java/LaunchpadReadyIT.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/testing/src/test/java/LaunchpadReadyIT.java?rev=1806038&r1=1806037&r2=1806038&view=diff
==============================================================================
--- sling/trunk/bundles/scripting/sightly/testing/src/test/java/LaunchpadReadyIT.java (original)
+++ sling/trunk/bundles/scripting/sightly/testing/src/test/java/LaunchpadReadyIT.java Thu Aug 24 13:10:03 2017
@@ -30,8 +30,8 @@ public class LaunchpadReadyIT {
     @Test
     public void testLaunchpadReady() throws Exception {
         SlingClient client = SLING_INSTANCE_RULE.getAdminClient();
-        client.waitUntilExists("/apps/sightly", 1000, 20);
-        client.waitUntilExists("/sightlytck", 1000, 20);
+        client.waitUntilExists("/apps/sightly", 1000, 60);
+        client.waitUntilExists("/sightlytck", 1000, 60);
     }
 
 }