You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by lb...@apache.org on 2019/08/20 15:39:47 UTC
[camel-quarkus] branch master updated: Fix #41 Re-introduce test
scope in integration test projects
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli 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 31861f0 Fix #41 Re-introduce test scope in integration test projects
31861f0 is described below
commit 31861f04afd583277e286df9398a0957f5f5b111
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Tue Aug 20 14:31:24 2019 +0200
Fix #41 Re-introduce test scope in integration test projects
---
integration-tests/aws/pom.xml | 7 ++---
integration-tests/bean/pom.xml | 2 ++
integration-tests/core-cdi/pom.xml | 2 ++
integration-tests/core/pom.xml | 2 ++
integration-tests/infinispan/pom.xml | 5 ++++
integration-tests/jdbc/pom.xml | 3 ++
integration-tests/netty4-http/pom.xml | 2 ++
integration-tests/pom.xml | 33 --------------------
integration-tests/salesforce/pom.xml | 2 ++
integration-tests/servlet/pom.xml | 2 ++
.../test-project-sanity-checks.groovy | 35 ----------------------
integration-tests/twitter/pom.xml | 2 ++
12 files changed, 24 insertions(+), 73 deletions(-)
diff --git a/integration-tests/aws/pom.xml b/integration-tests/aws/pom.xml
index 199f31b..401a31a 100644
--- a/integration-tests/aws/pom.xml
+++ b/integration-tests/aws/pom.xml
@@ -60,16 +60,13 @@
<!--
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy</artifactId>
- </dependency>
-
- <dependency>
- <groupId>io.quarkus</groupId>
<artifactId>quarkus-junit5</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>io.rest-assured</groupId>
<artifactId>rest-assured</artifactId>
+ <scope>test</scope>
</dependency>
-->
</dependencies>
diff --git a/integration-tests/bean/pom.xml b/integration-tests/bean/pom.xml
index a768d8a..20de6af 100644
--- a/integration-tests/bean/pom.xml
+++ b/integration-tests/bean/pom.xml
@@ -52,10 +52,12 @@
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-junit5</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>io.rest-assured</groupId>
<artifactId>rest-assured</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
diff --git a/integration-tests/core-cdi/pom.xml b/integration-tests/core-cdi/pom.xml
index 92e1a84..9649b88 100644
--- a/integration-tests/core-cdi/pom.xml
+++ b/integration-tests/core-cdi/pom.xml
@@ -51,10 +51,12 @@
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-junit5</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>io.rest-assured</groupId>
<artifactId>rest-assured</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
diff --git a/integration-tests/core/pom.xml b/integration-tests/core/pom.xml
index 4af1826..4b76bde 100644
--- a/integration-tests/core/pom.xml
+++ b/integration-tests/core/pom.xml
@@ -61,10 +61,12 @@
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-junit5</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>io.rest-assured</groupId>
<artifactId>rest-assured</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
diff --git a/integration-tests/infinispan/pom.xml b/integration-tests/infinispan/pom.xml
index f23cae6..62d3ae9 100644
--- a/integration-tests/infinispan/pom.xml
+++ b/integration-tests/infinispan/pom.xml
@@ -53,24 +53,29 @@
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-junit5</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>io.rest-assured</groupId>
<artifactId>rest-assured</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-core</artifactId>
<type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-server-hotrod</artifactId>
<type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-server-hotrod</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
diff --git a/integration-tests/jdbc/pom.xml b/integration-tests/jdbc/pom.xml
index 0d4a5d4..ee406e0 100644
--- a/integration-tests/jdbc/pom.xml
+++ b/integration-tests/jdbc/pom.xml
@@ -55,14 +55,17 @@
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-junit5</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-test-h2</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>io.rest-assured</groupId>
<artifactId>rest-assured</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
diff --git a/integration-tests/netty4-http/pom.xml b/integration-tests/netty4-http/pom.xml
index 1060236..f3becdd 100644
--- a/integration-tests/netty4-http/pom.xml
+++ b/integration-tests/netty4-http/pom.xml
@@ -49,10 +49,12 @@
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-junit5</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>io.rest-assured</groupId>
<artifactId>rest-assured</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index 14484e5..976c161 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -85,39 +85,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.codehaus.gmavenplus</groupId>
- <artifactId>gmavenplus-plugin</artifactId>
- <inherited>false</inherited>
- <executions>
- <execution>
- <id>test-project-sanity-checks</id>
- <goals>
- <goal>execute</goal>
- </goals>
- <phase>validate</phase>
- <configuration>
- <scripts>
- <script>file:///${project.basedir}/test-project-sanity-checks.groovy</script>
- </scripts>
- </configuration>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-ant</artifactId>
- <version>${groovy.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-xml</artifactId>
- <version>${groovy.version}</version>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
- </plugin>
</plugins>
</build>
diff --git a/integration-tests/salesforce/pom.xml b/integration-tests/salesforce/pom.xml
index fb053a9..534bc77 100644
--- a/integration-tests/salesforce/pom.xml
+++ b/integration-tests/salesforce/pom.xml
@@ -51,10 +51,12 @@
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-junit5</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>io.rest-assured</groupId>
<artifactId>rest-assured</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
diff --git a/integration-tests/servlet/pom.xml b/integration-tests/servlet/pom.xml
index 1ea5052..c0f7ae6 100644
--- a/integration-tests/servlet/pom.xml
+++ b/integration-tests/servlet/pom.xml
@@ -46,10 +46,12 @@
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-junit5</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>io.rest-assured</groupId>
<artifactId>rest-assured</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
diff --git a/integration-tests/test-project-sanity-checks.groovy b/integration-tests/test-project-sanity-checks.groovy
deleted file mode 100644
index d149cd6..0000000
--- a/integration-tests/test-project-sanity-checks.groovy
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import groovy.io.FileType
-
-def badDeps = []
-project.basedir.eachFile FileType.DIRECTORIES, { dir ->
- final File pomXml = new File(dir, "pom.xml")
- if (pomXml.exists()) {
- def pomXmlProject = new XmlParser().parseText(pomXml.getText('UTF-8'))
- pomXmlProject.dependencies.dependency
- .findAll { dep -> dep.scope.text() == 'test' }.stream()
- .map { dep -> "in "+ project.basedir.name +"/"+ dir.name +"/pom.xml : "+ dep.groupId.text() +":"+ dep.artifactId.text() }
- .each { key -> badDeps.add(key) }
- }
-}
-if (badDeps) {
- throw new RuntimeException("\nRemove <scope>test</scope> from the following dependencies:\n\n "
- + badDeps.join("\n ")
- + "\n\nThis is necessary to be able to build and run the test projects externally, e.g. inside Quarkus Platform")
-}
diff --git a/integration-tests/twitter/pom.xml b/integration-tests/twitter/pom.xml
index 74b670b..e5adbbb 100644
--- a/integration-tests/twitter/pom.xml
+++ b/integration-tests/twitter/pom.xml
@@ -47,10 +47,12 @@
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-junit5</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>io.rest-assured</groupId>
<artifactId>rest-assured</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>