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 eb38927 chore(build): cleanup build set-up
eb38927 is described below
commit eb389277aead41be6ffce0abcc4d5af09bd7648b
Author: lburgazzoli <lburgazz...@gmail.com>
AuthorDate: Wed Jul 10 16:31:38 2019 +0200
chore(build): cleanup build set-up
---
bom/pom.xml | 6 ---
build-parent/pom.xml | 50 ++++++++++++----------
integration-tests/pom.xml | 8 ++--
.../test-project-sanity-checks.groovy | 4 +-
pom.xml | 1 -
5 files changed, 34 insertions(+), 35 deletions(-)
diff --git a/bom/pom.xml b/bom/pom.xml
index 418fbbb..896bb05 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -44,12 +44,6 @@
<scope>import</scope>
</dependency>
- <!-- <dependency>
- <groupId>io.quarkus</groupId>
- <artifactId>quarkus-test-h2</artifactId>
- <version>${quarkus.version}</version>
- </dependency> -->
-
<!-- Camel -->
<dependency>
<groupId>org.apache.camel</groupId>
diff --git a/build-parent/pom.xml b/build-parent/pom.xml
index 6929ac8..e883eee 100644
--- a/build-parent/pom.xml
+++ b/build-parent/pom.xml
@@ -35,8 +35,14 @@
<properties>
<supported-maven-versions>[3.5.3,)</supported-maven-versions>
+ <groovy.version>2.5.7</groovy.version>
+
<maven-checkstyle-plugin.version>3.0.0</maven-checkstyle-plugin.version>
<maven-checkstyle.version>7.6.1</maven-checkstyle.version>
+ <jandex-maven-plugin.version>1.0.6</jandex-maven-plugin.version>
+ <maven-resources-plugin.version>3.1.0</maven-resources-plugin.version>
+ <gmavenplus-plugin.version>1.7.1</gmavenplus-plugin.version>
+ <docker-maven-plugin.version>0.3.0</docker-maven-plugin.version>
</properties>
<dependencyManagement>
@@ -117,10 +123,8 @@
<bannedDependencies>
<excludes>
<!-- Use javax.annotation-api -->
-
<exclude>org.jboss.spec.javax.annotation:jboss-annotations-api_1.2_spec
- </exclude>
-
<exclude>org.jboss.spec.javax.annotation:jboss-annotations-api_1.3_spec
- </exclude>
+
<exclude>org.jboss.spec.javax.annotation:jboss-annotations-api_1.2_spec</exclude>
+
<exclude>org.jboss.spec.javax.annotation:jboss-annotations-api_1.3_spec</exclude>
<!-- use our jboss-logmanager -->
<exclude>org.jboss.logging:jboss-logmanager</exclude>
<!-- We don't want all the API's
in one jar-->
@@ -149,11 +153,6 @@
</executions>
</plugin>
<plugin>
- <groupId>io.fabric8</groupId>
- <artifactId>docker-maven-plugin</artifactId>
- <version>0.29.0</version>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
@@ -163,23 +162,28 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.jboss.jandex</groupId>
- <artifactId>jandex-maven-plugin</artifactId>
- <version>1.0.6</version>
- </plugin>
- <plugin>
- <groupId>com.google.code.maven-replacer-plugin</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <version>1.5.3</version>
- </plugin>
- <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>3.1.0</version>
+ <version>${maven-resources-plugin.version}</version>
</plugin>
<plugin>
- <groupId>org.codehaus.gmaven</groupId>
- <artifactId>groovy-maven-plugin</artifactId>
- <version>2.1</version>
+ <groupId>org.codehaus.gmavenplus</groupId>
+ <artifactId>gmavenplus-plugin</artifactId>
+ <version>${gmavenplus-plugin.version}</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy</artifactId>
+ <version>${groovy.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-ant</artifactId>
+ <version>${groovy.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
</plugin>
</plugins>
</pluginManagement>
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index 311d2e3..e955bdb 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -89,8 +89,8 @@
<build>
<plugins>
<plugin>
- <groupId>org.codehaus.gmaven</groupId>
- <artifactId>groovy-maven-plugin</artifactId>
+ <groupId>org.codehaus.gmavenplus</groupId>
+ <artifactId>gmavenplus-plugin</artifactId>
<executions>
<execution>
<id>test-project-sanity-checks</id>
@@ -99,7 +99,9 @@
</goals>
<phase>validate</phase>
<configuration>
-
<source>${project.basedir}/../test-project-sanity-checks.groovy</source>
+ <scripts>
+
<script>file:///${project.basedir}/../test-project-sanity-checks.groovy</script>
+ </scripts>
</configuration>
</execution>
</executions>
diff --git a/integration-tests/test-project-sanity-checks.groovy
b/integration-tests/test-project-sanity-checks.groovy
index f85e670..88ca105 100644
--- a/integration-tests/test-project-sanity-checks.groovy
+++ b/integration-tests/test-project-sanity-checks.groovy
@@ -15,8 +15,8 @@
* limitations under the License.
*/
-final List badDeps = project.dependencies.findAll { 'test'.equals(it.scope) }
-if (!badDeps.isEmpty()) {
+def badDeps = project.dependencies.findAll { 'test' == it.scope }
+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/pom.xml b/pom.xml
index 3a59323..ea281b4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -142,7 +142,6 @@
<artifactId>quarkus-maven-plugin</artifactId>
<version>${quarkus.version}</version>
</plugin>
-
</plugins>
</pluginManagement>
</build>
