SLING-8687 Enable integration tests with Docker
* Drop profile it and execute integration tests during default build
* Increase container startup timeout from 3 to 5 minutes
diff --git a/pom.xml b/pom.xml
index 8c60564..4572384 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,41 +69,31 @@
</excludes>
</configuration>
</plugin>
+ <plugin>
+ <!-- integration tests require a running clam daemon -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>integration-test</goal>
+ <goal>verify</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <systemProperties>
+ <property>
+ <name>bundle.filename</name>
+ <value>${basedir}/target/${project.build.finalName}.jar</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
</plugins>
</build>
- <profiles>
- <profile>
- <!-- integration tests require a running clam daemon -->
- <id>it</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>integration-test</goal>
- <goal>verify</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <redirectTestOutputToFile>true</redirectTestOutputToFile>
- <systemProperties>
- <property>
- <name>bundle.filename</name>
- <value>${basedir}/target/${project.build.finalName}.jar</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
<dependencies>
<!-- javax -->
<dependency>
diff --git a/src/test/java/org/apache/sling/commons/clam/it/tests/ClamTestSupport.java b/src/test/java/org/apache/sling/commons/clam/it/tests/ClamTestSupport.java
index bac43e5..f38dda1 100644
--- a/src/test/java/org/apache/sling/commons/clam/it/tests/ClamTestSupport.java
+++ b/src/test/java/org/apache/sling/commons/clam/it/tests/ClamTestSupport.java
@@ -50,7 +50,7 @@
if (testcontainer) {
clamContainer = new GenericContainer<>(CLAM_CONTAINER_IMAGE_NAME)
.withExposedPorts(3310)
- .withStartupTimeout(Duration.ofMinutes(3));
+ .withStartupTimeout(Duration.ofMinutes(5));
clamContainer.start();
host = clamContainer.getContainerIpAddress();
port = clamContainer.getFirstMappedPort();
