You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by dk...@apache.org on 2020/11/30 19:48:22 UTC
[sling-org-apache-sling-app-cms] branch master updated: Updating to
fix release issues with the smoke tests
This is an automated email from the ASF dual-hosted git repository.
dklco pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git
The following commit(s) were added to refs/heads/master by this push:
new 3dd6182 Updating to fix release issues with the smoke tests
3dd6182 is described below
commit 3dd61828f8599ea8e99241b1f47262b37103f3f3
Author: Dan Klco <dk...@apache.org>
AuthorDate: Mon Nov 30 14:48:07 2020 -0500
Updating to fix release issues with the smoke tests
---
feature/pom.xml | 155 ++++++++++++++++++++++++++++++++------------------------
1 file changed, 90 insertions(+), 65 deletions(-)
diff --git a/feature/pom.xml b/feature/pom.xml
index b0afefa..46e9fe7 100644
--- a/feature/pom.xml
+++ b/feature/pom.xml
@@ -33,6 +33,7 @@
<oak.version>1.32.0</oak.version>
<slf4j.version>1.7.25</slf4j.version>
<bnd.baseline.skip>true</bnd.baseline.skip>
+ <run.sling.smoke.test>true</run.sling.smoke.test>
</properties>
<build>
@@ -184,75 +185,15 @@
</descriptors>
</configuration>
</plugin>
-
- <!-- reserve a network port for the integration tests -->
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>reserve-network-port</id>
- <goals>
- <goal>reserve-network-port</goal>
- </goals>
- <phase>pre-integration-test</phase>
- <configuration>
- <portNames>
- <portName>http.port</portName>
- </portNames>
- </configuration>
- </execution>
- </executions>
- </plugin>
<plugin>
- <groupId>org.apache.sling</groupId>
- <artifactId>feature-launcher-maven-plugin</artifactId>
- <version>0.1.0</version>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>2.5.3</version>
<configuration>
- <launches>
- <launch>
- <id>sling-12-oak-tar</id>
- <feature>
- <groupId>${project.groupId}</groupId>
- <artifactId>${project.artifactId}</artifactId>
- <version>${project.version}</version>
- <classifier>slingcms-standalone</classifier>
- <type>slingosgifeature</type>
- </feature>
- <launcherArguments>
- <frameworkProperties>
- <org.osgi.service.http.port>${http.port}</org.osgi.service.http.port>
- </frameworkProperties>
- </launcherArguments>
- </launch>
- </launches>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>start</goal>
- <goal>stop</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-failsafe-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>integration-test</goal>
- <goal>verify</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <systemPropertyVariables>
- <sling.http.port>${http.port}</sling.http.port>
- <IT.expected.bundles.count>${IT.expected.bundles.count}</IT.expected.bundles.count>
- </systemPropertyVariables>
+ <arguments>-Drun.sling.smoke.test=false</arguments>
</configuration>
</plugin>
+
</plugins>
<pluginManagement>
@@ -273,6 +214,90 @@
</pluginManagement>
</build>
+ <profiles>
+ <profile>
+ <id>run-smoke-test</id>
+ <activation>
+ <property>
+ <name>run.sling.smoke.test</name>
+ <value>true</value>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <!-- reserve a network port for the integration tests -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>reserve-network-port</id>
+ <goals>
+ <goal>reserve-network-port</goal>
+ </goals>
+ <phase>pre-integration-test</phase>
+ <configuration>
+ <portNames>
+ <portName>http.port</portName>
+ </portNames>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>feature-launcher-maven-plugin</artifactId>
+ <version>0.1.0</version>
+ <configuration>
+ <launches>
+ <launch>
+ <id>sling-12-oak-tar</id>
+ <feature>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>${project.artifactId}</artifactId>
+ <version>${project.version}</version>
+ <classifier>slingcms-standalone</classifier>
+ <type>slingosgifeature</type>
+ </feature>
+ <launcherArguments>
+ <frameworkProperties>
+ <org.osgi.service.http.port>${http.port}</org.osgi.service.http.port>
+ </frameworkProperties>
+ </launcherArguments>
+ </launch>
+ </launches>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>start</goal>
+ <goal>stop</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>integration-test</goal>
+ <goal>verify</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <systemPropertyVariables>
+ <sling.http.port>${http.port}</sling.http.port>
+ <IT.expected.bundles.count>${IT.expected.bundles.count}</IT.expected.bundles.count>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
<dependencies>
<dependency>
<groupId>junit</groupId>