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/11 21:09:33 UTC
[myfaces-tobago] 01/11: fix: maven docker profile
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
commit af371ecdd072a2c715aa8fa99653d6cc0f530f4e
Author: Henning Nöth <hn...@apache.org>
AuthorDate: Tue Dec 15 19:56:52 2020 +0100
fix: maven docker profile
* added missing dependencies to create a demo.war for tomcat
* use tomcat:latest
* demo starts without context path
* update docker-maven-plugin
---
tobago-example/tobago-example-demo/pom.xml | 77 +++++++++++++++++++++-
.../src/main/docker/assembly.xml | 2 +-
2 files changed, 76 insertions(+), 3 deletions(-)
diff --git a/tobago-example/tobago-example-demo/pom.xml b/tobago-example/tobago-example-demo/pom.xml
index 63cdced..78adb45 100644
--- a/tobago-example/tobago-example-demo/pom.xml
+++ b/tobago-example/tobago-example-demo/pom.xml
@@ -540,7 +540,7 @@
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
- <version>0.22.1</version>
+ <version>0.34.1</version>
<configuration>
<images>
<image>
@@ -551,7 +551,7 @@
</ports>
</run>
<build>
- <from>tomcat:8.5.15-jre8</from>
+ <from>tomcat</from>
<assembly>
<descriptor>assembly.xml</descriptor>
<basedir>/usr/local/tomcat</basedir>
@@ -563,9 +563,82 @@
</image>
</images>
</configuration>
+ <executions>
+ <execution>
+ <id>build</id>
+ <phase>package</phase>
+ <goals>
+ <goal>build</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <version>${myfaces23.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ <version>${myfaces23.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-jsf</artifactId>
+ <version>${openwebbeans.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-web</artifactId>
+ <version>${openwebbeans.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-resource</artifactId>
+ <version>${openwebbeans.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.tobago</groupId>
+ <artifactId>tobago-config-owb</artifactId>
+ <version>${tobago.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject-api</artifactId>
+ <version>1.0.1</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.enterprise</groupId>
+ <artifactId>jakarta.enterprise.cdi-api</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <!-- this enables the development mode -->
+ <dependency>
+ <groupId>org.apache.myfaces.tobago</groupId>
+ <artifactId>tobago-config-dev</artifactId>
+ <version>${tobago.version}</version>
+ </dependency>
+ <dependency> <!-- add JAXB to run the demo with Java 11 and higher -->
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.3.1</version>
+ </dependency>
+ </dependencies>
</profile>
<profile>
diff --git a/tobago-example/tobago-example-demo/src/main/docker/assembly.xml b/tobago-example/tobago-example-demo/src/main/docker/assembly.xml
index 622e57e..98cff35 100644
--- a/tobago-example/tobago-example-demo/src/main/docker/assembly.xml
+++ b/tobago-example/tobago-example-demo/src/main/docker/assembly.xml
@@ -30,7 +30,7 @@
<!--<useProjectArtifact>true</useProjectArtifact>-->
<useTransitiveDependencies>false</useTransitiveDependencies>
<outputDirectory>webapps</outputDirectory>
- <outputFileNameMapping>tobago-example-demo.war</outputFileNameMapping>
+ <outputFileNameMapping>ROOT.war</outputFileNameMapping>
</dependencySet>
</dependencySets>