This is an automated email from the ASF dual-hosted git repository.
jgallimore pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/master by this push:
new 3426b25 Removed parent from pom.xml in mp-opentracing-traced example
new f8b310c Merge pull request #477 from davidsalter/TOMEE-2537
3426b25 is described below
commit 3426b25b07d73082fca59e09162ebeb33ef2048d
Author: David Salter <[email protected]>
AuthorDate: Fri May 31 16:51:15 2019 +0100
Removed parent from pom.xml in mp-opentracing-traced example
---
examples/mp-opentracing-traced/pom.xml | 27 +++++++++++++++------------
1 file changed, 15 insertions(+), 12 deletions(-)
diff --git a/examples/mp-opentracing-traced/pom.xml
b/examples/mp-opentracing-traced/pom.xml
index 264f0c1..eff57f7 100644
--- a/examples/mp-opentracing-traced/pom.xml
+++ b/examples/mp-opentracing-traced/pom.xml
@@ -20,17 +20,19 @@
<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";>
- <parent>
- <artifactId>examples</artifactId>
- <groupId>org.apache.tomee</groupId>
- <version>8.0.0-SNAPSHOT</version>
- </parent>
+
<modelVersion>4.0.0</modelVersion>
+ <groupId>org.superbiz</groupId>
<artifactId>mp-opentracing.traced</artifactId>
+ <version>8.0.0-SNAPSHOT</version>
<packaging>war</packaging>
-
+ <properties>
+ <version.javaee-api>8.0</version.javaee-api>
+ <tomee.version>8.0.0-SNAPSHOT</tomee.version>
+ <version.arquillian.bom>1.1.13.Final</version.arquillian.bom>
+ </properties>
<dependencies>
<dependency>
<groupId>org.apache.tomee</groupId>
@@ -38,12 +40,6 @@
<version>${version.javaee-api}</version>
<scope>provided</scope>
</dependency>
- <!-- <dependency> // unncecessary metrics dependency
- <groupId>org.eclipse.microprofile.metrics</groupId>
- <artifactId>microprofile-metrics-api</artifactId>
- <version>${microprofile.metrics.version}</version>
- <scope>provided</scope>
- </dependency> -->
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>openejb-cxf-rs</artifactId>
@@ -83,6 +79,13 @@
<context>${project.artifactId}</context>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>3.1.0</version>
+ <configuration>
+ <failOnMissingWebXml>false</failOnMissingWebXml>
+ </configuration>
+ </plugin>
</plugins>
</build>
