This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/master by this push:
new 538447d chore(it): cleanup it poms
new 364a959 Merge pull request #90 from lburgazzoli/it-pom-cleanup
538447d is described below
commit 538447da2a1472b185700c69f04fea2b62631632
Author: lburgazzoli <[email protected]>
AuthorDate: Wed Jul 24 16:42:43 2019 +0200
chore(it): cleanup it poms
---
integration-tests/aws/pom.xml | 20 +-------------------
integration-tests/core/pom.xml | 19 -------------------
integration-tests/jdbc/pom.xml | 1 -
integration-tests/netty4-http/pom.xml | 23 ++---------------------
integration-tests/salesforce/pom.xml | 25 ++++++++-----------------
integration-tests/servlet/pom.xml | 6 ------
6 files changed, 11 insertions(+), 83 deletions(-)
diff --git a/integration-tests/aws/pom.xml b/integration-tests/aws/pom.xml
index f03370b..edcb985 100644
--- a/integration-tests/aws/pom.xml
+++ b/integration-tests/aws/pom.xml
@@ -28,10 +28,9 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>camel-quarkus-integration-test-aws</artifactId>
- <name>Camel Quarkus :: Integration Tests :: AWS Integration tests</name>
+ <name>Camel Quarkus :: Integration Tests :: AWS</name>
<description>The camel integration tests</description>
-
<dependencies>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
@@ -71,10 +70,6 @@
<artifactId>quarkus-junit5</artifactId>
</dependency>
<dependency>
- <groupId>org.glassfish</groupId>
- <artifactId>javax.json</artifactId>
- </dependency>
- <dependency>
<groupId>io.rest-assured</groupId>
<artifactId>rest-assured</artifactId>
</dependency>
@@ -82,12 +77,6 @@
</dependencies>
<build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
@@ -112,13 +101,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
</plugins>
</build>
diff --git a/integration-tests/core/pom.xml b/integration-tests/core/pom.xml
index 56e4c00..74405a3 100644
--- a/integration-tests/core/pom.xml
+++ b/integration-tests/core/pom.xml
@@ -31,7 +31,6 @@
<name>Camel Quarkus :: Integration Tests :: Core</name>
<description>The camel integration tests</description>
-
<dependencies>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
@@ -57,10 +56,6 @@
<artifactId>quarkus-junit5</artifactId>
</dependency>
<dependency>
- <groupId>org.glassfish</groupId>
- <artifactId>javax.json</artifactId>
- </dependency>
- <dependency>
<groupId>io.rest-assured</groupId>
<artifactId>rest-assured</artifactId>
</dependency>
@@ -68,21 +63,7 @@
</dependencies>
<build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
<plugins>
- <!-- Skip enforcer plugin as we want to use jboss marshalling for
test class -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
<plugin>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-maven-plugin</artifactId>
diff --git a/integration-tests/jdbc/pom.xml b/integration-tests/jdbc/pom.xml
index da7ef8c..fbf4993 100644
--- a/integration-tests/jdbc/pom.xml
+++ b/integration-tests/jdbc/pom.xml
@@ -31,7 +31,6 @@
<name>Camel Quarkus :: Integration Tests :: JDBC</name>
<description>Integration tests for Camel JDBC extension</description>
-
<dependencies>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
diff --git a/integration-tests/netty4-http/pom.xml
b/integration-tests/netty4-http/pom.xml
index 5cd17c6..5fc9697 100644
--- a/integration-tests/netty4-http/pom.xml
+++ b/integration-tests/netty4-http/pom.xml
@@ -31,7 +31,6 @@
<name>Camel Quarkus :: Integration Tests :: Netty4 Http</name>
<description>The camel integration tests</description>
-
<dependencies>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
@@ -46,18 +45,14 @@
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-undertow</artifactId>
- </dependency><![CDATA[
+ </dependency>
- ]]><!-- test dependencies -->
+ <!-- test dependencies -->
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-junit5</artifactId>
</dependency>
<dependency>
- <groupId>org.glassfish</groupId>
- <artifactId>javax.json</artifactId>
- </dependency>
- <dependency>
<groupId>io.rest-assured</groupId>
<artifactId>rest-assured</artifactId>
</dependency>
@@ -65,21 +60,7 @@
</dependencies>
<build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
<plugins>
- <!-- Skip enforcer plugin as we want to use jboss marshalling for
test class -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
<plugin>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-maven-plugin</artifactId>
diff --git a/integration-tests/salesforce/pom.xml
b/integration-tests/salesforce/pom.xml
index 7937f6a..f479dfd 100644
--- a/integration-tests/salesforce/pom.xml
+++ b/integration-tests/salesforce/pom.xml
@@ -31,6 +31,14 @@
<name>Camel Quarkus :: Integration Tests :: Salesforce</name>
<description>The camel integration tests</description>
+ <properties>
+ <!--
+ Skip enforcer plugin because of dependency convergence error
between
+ camel-salesforce and the version of jetty used by cometd
+ -->
+ <enforcer.skip>true</enforcer.skip>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
@@ -55,22 +63,12 @@
<artifactId>quarkus-junit5</artifactId>
</dependency>
<dependency>
- <groupId>org.glassfish</groupId>
- <artifactId>javax.json</artifactId>
- </dependency>
- <dependency>
<groupId>io.rest-assured</groupId>
<artifactId>rest-assured</artifactId>
</dependency>
</dependencies>
<build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
@@ -95,13 +93,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
</plugins>
</build>
diff --git a/integration-tests/servlet/pom.xml
b/integration-tests/servlet/pom.xml
index 48449d8..65bcd22 100644
--- a/integration-tests/servlet/pom.xml
+++ b/integration-tests/servlet/pom.xml
@@ -54,12 +54,6 @@
</dependencies>
<build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
<plugins>
<plugin>
<groupId>io.quarkus</groupId>
