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-sightly-testing.git
The following commit(s) were added to refs/heads/master by this push:
new b7472c9 SLING-8471 - Update the HTL modules to the Sling bundle
parent pom 35
b7472c9 is described below
commit b7472c9cb70f32f7b11a5d42c67ed60366dfb5ce
Author: Radu Cotescu <[email protected]>
AuthorDate: Wed Jun 5 18:06:35 2019 +0200
SLING-8471 - Update the HTL modules to the Sling bundle parent pom 35
---
pom.xml | 222 +---------------------------------------------------------------
1 file changed, 1 insertion(+), 221 deletions(-)
diff --git a/pom.xml b/pom.xml
index 5d6e5a9..eb9bf52 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>34</version>
+ <version>35</version>
<relativePath />
</parent>
@@ -73,7 +73,6 @@
-->
<debug.options />
- <jacoco.maven.plugin.version>0.7.9</jacoco.maven.plugin.version>
<!-- HTL modules under test versions -->
<org.apache.sling.scripting.sightly.runtime.version>1.1.1-1.4.0-SNAPSHOT</org.apache.sling.scripting.sightly.runtime.version>
<org.apache.sling.scripting.sightly.compiler.version>1.2.0-1.4.0-SNAPSHOT</org.apache.sling.scripting.sightly.compiler.version>
@@ -265,225 +264,6 @@
</plugins>
</build>
</profile>
- <profile>
- <!--
- This profile allows running code coverage reports for the
integration tests. In addition, if the other modules have been
- built from the reactor, their jacoco reports will be merged to
produce a report containing coverage information about
- both unit and integration tests.
-
- By default the latest snapshots will be used for generating
the report. If, however, you want to run the report on
- released versions then this can be achieved with the following
command:
-
- mvn clean verify -Pcoverage-report \
-
-Dorg.apache.sling.scripting.sightly.compiler.version=1.0.2 \
-
-Dorg.apache.sling.scripting.sightly.compiler.java.version=1.0.4 \
- -Dorg.apache.sling.scripting.sightly.version=1.0.26 \
-
-Dorg.apache.sling.scripting.sightly.js.provider.version=1.0.16 \
-
-Dorg.apache.sling.scripting.sightly.models.provider.version=1.0.4
-
- -->
- <id>coverage-report</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <properties>
- <failsafe.exclude>%regex[.*PerformanceIT.*]</failsafe.exclude>
- </properties>
- <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>
- <configuration>
- <includeArtifactIds>
- org.apache.sling.scripting.sightly.compiler,
-
org.apache.sling.scripting.sightly.compiler.java,
- org.apache.sling.scripting.sightly,
- org.apache.sling.scripting.sightly.js.provider,
-
org.apache.sling.scripting.sightly.models.provider
- </includeArtifactIds>
- <transitive>false</transitive>
- </configuration>
- <executions>
- <execution>
- <id>copy-sources</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>unpack-dependencies</goal>
- </goals>
- <configuration>
- <classifier>sources</classifier>
-
<failOnMissingClassifierArtifact>true</failOnMissingClassifierArtifact>
-
<outputDirectory>${project.build.directory}/generated-sources</outputDirectory>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <version>3.0.1</version>
- <executions>
- <execution>
- <id>copy-resources</id>
- <phase>validate</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
-
<outputDirectory>${basedir}/target/</outputDirectory>
- <resources>
- <resource>
-
<directory>../compiler/target/</directory>
- <includes>
- <include>jacoco.exec</include>
- </includes>
-
<targetPath>compiler-jacoco</targetPath>
- </resource>
- <resource>
-
<directory>../java-compiler/target/</directory>
- <includes>
- <include>jacoco.exec</include>
- </includes>
-
<targetPath>java-compiler-jacoco</targetPath>
- </resource>
- <resource>
-
<directory>../engine/target/</directory>
- <includes>
- <include>jacoco.exec</include>
- </includes>
-
<targetPath>engine-jacoco</targetPath>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.sling</groupId>
- <artifactId>slingstart-maven-plugin</artifactId>
- <extensions>true</extensions>
- <executions>
- <execution>
- <id>start-container</id>
- <goals>
- <goal>start</goal>
- <goal>stop</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <usePomDependencies>true</usePomDependencies>
- <servers>
- <server>
- <port>${http.port}</port>
-
<controlPort>${sling.control.port}</controlPort>
- <runmode>${sling.run.modes}</runmode>
-
<contextPath>${http.base.path}</contextPath>
- <debug>${jacoco.agent}</debug>
- </server>
- </servers>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.jacoco</groupId>
- <artifactId>jacoco-maven-plugin</artifactId>
- <version>${jacoco.maven.plugin.version}</version>
- <executions>
- <execution>
- <id>default-prepare-agent</id>
- <goals>
- <goal>prepare-agent</goal>
- </goals>
- <configuration>
- <propertyName>jacoco.agent</propertyName>
-
<destFile>${project.build.directory}/jacoco-it.exec</destFile>
- </configuration>
- </execution>
- <execution>
- <id>merge-reports</id>
- <phase>verify</phase>
- <goals>
- <goal>merge</goal>
- </goals>
- <configuration>
- <fileSets>
- <fileSet>
-
<directory>${project.build.directory}</directory>
- <includes>
-
<include>jacoco-it.exec</include>
-
<include>compiler-jacoco/jacoco.exec</include>
-
<include>java-compiler-jacoco/jacoco.exec</include>
-
<include>engine-jacoco/jacoco.exec</include>
- </includes>
- </fileSet>
- </fileSets>
-
<destFile>${project.build.directory}/jacoco.exec</destFile>
- </configuration>
- </execution>
- <execution>
- <id>final-report</id>
- <phase>verify</phase>
- <goals>
- <goal>report</goal>
- </goals>
- <configuration>
- <includes>
-
<include>org/apache/sling/scripting/sightly/**/*</include>
- </includes>
- <excludes>
-
<exclude>org/apache/sling/scripting/sightly/impl/parser/expr/generated/**/*</exclude>
- </excludes>
- </configuration>
- </execution>
- <execution>
- <id>check-coverage</id>
- <goals>
- <goal>check</goal>
- </goals>
- <configuration>
- <includes>
-
<include>org/apache/sling/scripting/sightly/**/*</include>
- </includes>
- <excludes>
-
<exclude>org/apache/sling/scripting/sightly/impl/parser/expr/generated/**/*</exclude>
- </excludes>
- <rules>
- <rule>
- <element>BUNDLE</element>
- <limits>
- <limit>
-
<counter>INSTRUCTION</counter>
- <value>COVEREDRATIO</value>
- <minimum>0.80</minimum>
- </limit>
- </limits>
- </rule>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
</profiles>
<dependencies>
