You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by bo...@apache.org on 2021/01/13 10:12:42 UTC
[myfaces-tobago] branch master updated: improved integration test
This is an automated email from the ASF dual-hosted git repository.
bommel pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
The following commit(s) were added to refs/heads/master by this push:
new cb08e90 improved integration test
cb08e90 is described below
commit cb08e901794f1343dc2569ed03e33d93828aaa0c
Author: Bernd Bohmann <bo...@apache.org>
AuthorDate: Wed Jan 13 10:10:20 2021 +0100
improved integration test
---
tobago-example/tobago-example-demo/pom.xml | 70 ++++++++++++++--------
.../main/webapp/content/10-intro/70-faq/FAQ.xhtml | 2 +-
2 files changed, 45 insertions(+), 27 deletions(-)
diff --git a/tobago-example/tobago-example-demo/pom.xml b/tobago-example/tobago-example-demo/pom.xml
index 8606d45..8c0dc74 100644
--- a/tobago-example/tobago-example-demo/pom.xml
+++ b/tobago-example/tobago-example-demo/pom.xml
@@ -149,6 +149,37 @@
</configuration>
</plugin>
</plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>io.fabric8</groupId>
+ <artifactId>docker-maven-plugin</artifactId>
+ <version>0.34.1</version>
+ <configuration>
+ <images>
+ <image>
+ <name>myfaces/%a:%l</name>
+ <run>
+ <ports>
+ <port>8080:8080</port>
+ </ports>
+ </run>
+ <build>
+ <from>tomcat:9.0-jdk11</from>
+ <assembly>
+ <descriptor>assembly.xml</descriptor>
+ <basedir>/usr/local/tomcat</basedir>
+ </assembly>
+ <ports>
+ <port>8080</port>
+ </ports>
+ </build>
+ </image>
+ </images>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
<dependencyManagement>
@@ -273,6 +304,19 @@
<build>
<plugins>
<plugin>
+ <groupId>io.fabric8</groupId>
+ <artifactId>docker-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>build</id>
+ <phase>package</phase>
+ <goals>
+ <goal>build</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<includes>
@@ -324,32 +368,6 @@
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
- <version>0.34.1</version>
- <configuration>
- <images>
- <image>
- <name>myfaces/tobago-example-demo</name>
- <run>
- <ports>
- <port>8080:8080</port>
- </ports>
- </run>
- <build>
- <from>tomcat:9.0.41-jdk11</from>
- <tags>
- <tag>${tobago.version}</tag>
- </tags>
- <assembly>
- <descriptor>assembly.xml</descriptor>
- <basedir>/usr/local/tomcat</basedir>
- </assembly>
- <ports>
- <port>8080</port>
- </ports>
- </build>
- </image>
- </images>
- </configuration>
<executions>
<execution>
<id>build</id>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/70-faq/FAQ.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/70-faq/FAQ.xhtml
index 3c86077..dd89039 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/70-faq/FAQ.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/70-faq/FAQ.xhtml
@@ -341,7 +341,7 @@ mvn -Pdocker-qunit-tests docker:stop</demo-highlight>
testcontainers.</p>
<p>To run the integration tests:</p>
<demo-highlight language="markup">cd tobago-example/tobago-example-demo
-mvn clean install -Pdocker -Pintegration-tests
+mvn clean install -Pintegration-tests
</demo-highlight>
<p>The docker container can be rebuild with:</p>
<demo-highlight language="markup">mvn package -Pdocker</demo-highlight>