You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ra...@apache.org on 2019/08/29 14:13:11 UTC
[sling-org-apache-sling-scripting-bundle-tracker-it] branch master
updated: trivial: IT enabled by default
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
The following commit(s) were added to refs/heads/master by this push:
new 2a847db trivial: IT enabled by default
2a847db is described below
commit 2a847db12b04cbfae7b25d88bc351d59373e4e4f
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Thu Aug 29 16:13:02 2019 +0200
trivial: IT enabled by default
---
it/pom.xml | 280 ++++++++++++++++++++++++++++---------------------------------
1 file changed, 127 insertions(+), 153 deletions(-)
diff --git a/it/pom.xml b/it/pom.xml
index 8499931..473f73b 100644
--- a/it/pom.xml
+++ b/it/pom.xml
@@ -34,11 +34,96 @@
<properties>
<jacoco.maven.plugin.version>0.8.2</jacoco.maven.plugin.version>
+ <http.host>localhost</http.host>
+ <http.port>8080</http.port>
+ <sling.vm.options>-Xmx256m -Djava.awt.headless=true</sling.vm.options>
+ <skipTests>false</skipTests>
</properties>
<build>
<plugins>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>reserve-network-port</id>
+ <goals>
+ <!-- pre-integration-test is too late -->
+ <goal>reserve-network-port</goal>
+ </goals>
+ <phase>process-resources</phase>
+ <configuration>
+ <portNames>
+ <portName>http.port</portName>
+ </portNames>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <argLine>@{argLine}</argLine>
+ <skipTests>${skipTests}</skipTests>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>integration-test</id>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>integration-test</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>verify</id>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>verify</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <systemPropertyVariables>
+ <launchpad.http.server.url>http://${http.host}:${http.port}/</launchpad.http.server.url>
+ </systemPropertyVariables>
+ </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/bundle/tracker/**/*.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>
@@ -46,7 +131,43 @@
<extensions>true</extensions>
<configuration>
<usePomDependencies>true</usePomDependencies>
+ <attachArtifact>false</attachArtifact>
+ <servers>
+ <server>
+ <id>bundle-tracker-it-instance</id>
+ <port>${http.port}</port>
+ <vmOpts>${sling.vm.options} ${jacoco.agent}</vmOpts>
+ </server>
+ </servers>
</configuration>
+ <executions>
+ <execution>
+ <id>prepare-launchpad-package</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>prepare-package</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>build-launchpad-package</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>package</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>start-container-before-IT</id>
+ <goals>
+ <goal>start</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>stop-container-after-IT</id>
+ <goals>
+ <goal>stop</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
@@ -157,147 +278,10 @@
<profiles>
<profile>
- <id>it</id>
- <properties>
- <http.host>localhost</http.host>
- <sling.vm.options>-Xmx1024m -XX:MaxPermSize=256m -Djava.awt.headless=true</sling.vm.options>
- </properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>reserve-network-port</id>
- <goals>
- <!-- pre-integration-test is too late -->
- <goal>reserve-network-port</goal>
- </goals>
- <phase>process-resources</phase>
- <configuration>
- <portNames>
- <portName>http.port.testing</portName>
- </portNames>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>@{argLine}</argLine>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <executions>
- <execution>
- <id>integration-test</id>
- <phase>integration-test</phase>
- <goals>
- <goal>integration-test</goal>
- </goals>
- </execution>
- <execution>
- <id>verify</id>
- <phase>integration-test</phase>
- <goals>
- <goal>verify</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <systemPropertyVariables>
- <launchpad.http.server.url>http://${http.host}:${http.port.testing}/</launchpad.http.server.url>
- </systemPropertyVariables>
- </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/bundle/tracker/**/*.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>
- <extensions>true</extensions>
- <executions>
- <execution>
- <id>prepare-launchpad-package</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>prepare-package</goal>
- </goals>
- </execution>
- <execution>
- <id>build-launchpad-package</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>package</goal>
- </goals>
- </execution>
- <execution>
- <id>start-container-before-IT</id>
- <goals>
- <goal>start</goal>
- </goals>
- </execution>
- <execution>
- <id>stop-container-after-IT</id>
- <goals>
- <goal>stop</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <usePomDependencies>true</usePomDependencies>
- <attachArtifact>false</attachArtifact>
- <servers>
- <server>
- <id>testinstance</id>
- <port>${http.port.testing}</port>
- <vmOpts>${sling.vm.options} ${jacoco.agent}</vmOpts>
- </server>
- </servers>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
<id>example</id>
<properties>
- <http.host>localhost</http.host>
- <http.port>8080</http.port>
- <sling.vm.options>-Xmx1024m -XX:MaxPermSize=256m -Djava.awt.headless=true -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8000</sling.vm.options>
+ <sling.vm.options>-Xmx256m -Djava.awt.headless=true -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8000</sling.vm.options>
+ <skipTests>true</skipTests>
</properties>
<build>
<plugins>
@@ -305,8 +289,6 @@
<!-- 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>
- <version>1.7.16</version>
- <extensions>true</extensions>
<executions>
<execution>
<id>prepare-launchpad-package</id>
@@ -329,23 +311,15 @@
</goals>
</execution>
<execution>
+ <id>stop-container-after-IT</id>
<goals>
<goal>stop</goal>
</goals>
+ <configuration>
+ <shouldBlockUntilKeyIsPressed>true</shouldBlockUntilKeyIsPressed>
+ </configuration>
</execution>
</executions>
- <configuration>
- <usePomDependencies>true</usePomDependencies>
- <attachArtifact>false</attachArtifact>
- <shouldBlockUntilKeyIsPressed>true</shouldBlockUntilKeyIsPressed>
- <servers>
- <server>
- <id>exampleinstance</id>
- <port>${http.port}</port>
- <vmOpts>${sling.vm.options}</vmOpts>
- </server>
- </servers>
- </configuration>
</plugin>
</plugins>
</build>