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/22 12:29:53 UTC
[camel-quarkus] 02/02: Fixup #58 Enforce dependency rules
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
commit 6726300c4e69be01c2c44412d9a54ad04edce6fc
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Thu Aug 22 11:45:31 2019 +0200
Fixup #58 Enforce dependency rules
---
extensions/pom.xml | 10 ++++------
pom.xml | 4 ++--
poms/build-parent/pom.xml | 17 ++++++++---------
3 files changed, 14 insertions(+), 17 deletions(-)
diff --git a/extensions/pom.xml b/extensions/pom.xml
index a69a6d0..b78bf5a 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -78,9 +78,9 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.codehaus.gmavenplus</groupId>
- <artifactId>gmavenplus-plugin</artifactId>
- <version>${gmavenplus-plugin.version}</version>
+ <groupId>org.codehaus.gmaven</groupId>
+ <artifactId>groovy-maven-plugin</artifactId>
+ <version>${groovy-maven-plugin.version}</version>
<inherited>false</inherited>
<executions>
<execution>
@@ -90,9 +90,7 @@
</goals>
<phase>validate</phase>
<configuration>
- <scripts>
- <script>file:///${project.basedir}/../build/scripts/list-camel-quarkus-extensions.groovy</script>
- </scripts>
+ <source>file:///${project.basedir}/../build/scripts/list-camel-quarkus-extensions.groovy</source>
</configuration>
</execution>
</executions>
diff --git a/pom.xml b/pom.xml
index 5ff875b..47621aa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,8 +55,8 @@
<supported-maven-versions>[3.5.3,)</supported-maven-versions>
<exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
- <gmavenplus-plugin.version>1.7.1</gmavenplus-plugin.version>
- <groovy.version>2.5.7</groovy.version>
+ <groovy-maven-plugin.version>2.1.1</groovy-maven-plugin.version>
+ <groovy.version>2.5.8</groovy.version>
<mycila-license.version>3.0</mycila-license.version>
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
<maven-deploy-plugin.version>3.0.0-M1</maven-deploy-plugin.version>
diff --git a/poms/build-parent/pom.xml b/poms/build-parent/pom.xml
index beec23b..0d45856 100644
--- a/poms/build-parent/pom.xml
+++ b/poms/build-parent/pom.xml
@@ -76,9 +76,9 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.codehaus.gmavenplus</groupId>
- <artifactId>gmavenplus-plugin</artifactId>
- <version>${gmavenplus-plugin.version}</version>
+ <groupId>org.codehaus.gmaven</groupId>
+ <artifactId>groovy-maven-plugin</artifactId>
+ <version>${groovy-maven-plugin.version}</version>
<dependencies>
<dependency>
<groupId>org.codehaus.groovy</groupId>
@@ -93,8 +93,8 @@
<plugins>
<plugin>
- <groupId>org.codehaus.gmavenplus</groupId>
- <artifactId>gmavenplus-plugin</artifactId>
+ <groupId>org.codehaus.gmaven</groupId>
+ <artifactId>groovy-maven-plugin</artifactId>
<executions>
<execution>
<id>sanity-checks</id>
@@ -103,8 +103,8 @@
</goals>
<phase>validate</phase>
<configuration>
- <scripts>
- <script><![CDATA[
+ <useSharedClassLoader>false</useSharedClassLoader>
+ <source><![CDATA[
final List<String> badDeps = []
final File pomXml = new File(project.basedir, "pom.xml")
if (pomXml.exists()) {
@@ -120,8 +120,7 @@
throw new RuntimeException("\nRemove explicit version from the following dependencies and rather manage them in one of the BOMs:\n\n "
+ badDeps.join("\n "))
}
- ]]></script>
- </scripts>
+ ]]></source>
</configuration>
</execution>
</executions>