From c1c73e323723213f0636b45c0d83be2046335d4e Mon Sep 17 00:00:00 2001
From: Dan K <dk14142@gmail.com>
Date: Mon, 22 Jul 2019 22:04:38 +0200
Subject: [PATCH] WIP(ch9lab) update POM dependencies
---
todo-api-micro/pom.xml | 81 +++++++++++++++++++++++++---------------
1 files changed, 50 insertions(+), 31 deletions(-)
diff --git a/todo-api-micro/pom.xml b/todo-api-micro/pom.xml
index b227a11..f2e46ef 100755
--- a/todo-api-micro/pom.xml
+++ b/todo-api-micro/pom.xml
@@ -1,42 +1,73 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
+
<groupId>com.redhat.training.example</groupId>
<artifactId>todo-api</artifactId>
- <name>WildFly Swarm Example</name>
<version>1.0.0-SNAPSHOT</version>
<packaging>war</packaging>
+ <name>ToDo API Thorntail Example</name>
+ <description>ToDo API microservice using Thorntail</description>
<properties>
- <version.wildfly.swarm>2017.12.1</version.wildfly.swarm>
- <version.mysql>6.0.6</version.mysql>
- <maven.compiler.source>1.8</maven.compiler.source>
- <maven.compiler.target>1.8</maven.compiler.target>
- <failOnMissingWebXml>false</failOnMissingWebXml>
+ <!-- Explicitly declaring the source encoding eliminates the following
+ message: -->
+ <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered
+ resources, i.e. build is platform dependent! -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <fabric8.maven.plugin.version>3.1.80.redhat-000019</fabric8.maven.plugin.version>
- <fabric8.version>2.3.6</fabric8.version>
+ <failOnMissingWebXml>false</failOnMissingWebXml>
+
+ <!-- Thorntail dependency versions -->
+ <version.thorntail>2.4.0.Final</version.thorntail>
+
+ <!-- other plugin versions -->
+ <version.compiler.plugin>3.1</version.compiler.plugin>
+ <version.surefire.plugin>2.16</version.surefire.plugin>
+ <version.war.plugin>2.5</version.war.plugin>
+ <version.fabric8.plugin>4.1.0</version.fabric8.plugin>
+
+ <!-- maven-compiler-plugin -->
+ <maven.compiler.target>1.8</maven.compiler.target>
+ <maven.compiler.source>1.8</maven.compiler.source>
</properties>
+
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.wildfly.swarm</groupId>
+ <groupId>io.thorntail</groupId>
<artifactId>bom-all</artifactId>
- <version>${version.wildfly.swarm}</version>
+ <version>${version.thorntail}</version>
<scope>import</scope>
<type>pom</type>
</dependency>
</dependencies>
</dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>io.thorntail</groupId>
+ <artifactId>cdi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.thorntail</groupId>
+ <artifactId>jaxrs</artifactId>
+ </dependency>
+ </dependencies>
+
<build>
- <finalName>demo</finalName>
+ <!-- Maven will append the version to the finalName (which is the name
+ given to the generated war, and hence the context root) -->
+ <finalName>hello</finalName>
<plugins>
+ <!-- The Thorntail Maven plugin creates an uber jar -->
+ <!-- To use, run: mvn thorntail:run -->
<plugin>
- <groupId>org.wildfly.swarm</groupId>
- <artifactId>wildfly-swarm-plugin</artifactId>
- <version>${version.wildfly.swarm}</version>
+ <groupId>io.thorntail</groupId>
+ <artifactId>thorntail-maven-plugin</artifactId>
+ <version>${version.thorntail}</version>
<executions>
<execution>
<goals>
@@ -48,30 +79,16 @@
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>fabric8-maven-plugin</artifactId>
+ <version>${version.fabric8.plugin}</version>
<executions>
<execution>
+ <id>fmp</id>
<goals>
<goal>resource</goal>
<goal>build</goal>
</goals>
</execution>
</executions>
- <configuration>
- <generator>
- <includes>
- <include>wildfly-swarm</include>
- </includes>
- <excludes>
- <exclude>webapp</exclude>
- </excludes>
- <config>
- <wildfly-swarm>
- <fromMode>isTag</fromMode>
- <from>redhat-openjdk18-openshift</from>
- </wildfly-swarm>
- </config>
- </generator>
- </configuration>
</plugin>
</plugins>
</build>
@@ -108,4 +125,6 @@
<version>${version.mysql}</version>
</dependency>
</dependencies>
+
+
</project>
--
Gitblit v1.9.3