You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2020/09/21 16:15:56 UTC
[camel-k-runtime] branch master updated: chore(build): use
dependency management for dependencies and plugins
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-k-runtime.git
The following commit(s) were added to refs/heads/master by this push:
new 3ff566b chore(build): use dependency management for dependencies and plugins
3ff566b is described below
commit 3ff566b14ba965c2b7bfe312e28e7e21a661a13a
Author: Luca Burgazzoli <lb...@gmail.com>
AuthorDate: Mon Sep 21 17:30:54 2020 +0200
chore(build): use dependency management for dependencies and plugins
---
camel-k-loader-groovy/pom.xml | 1 -
camel-k-loader-java/pom.xml | 1 -
camel-k-loader-js/pom.xml | 1 -
.../camel-k-loader-kotlin/pom.xml | 1 -
camel-k-loader-xml/pom.xml | 1 -
.../camel-k-loader-yaml-common/pom.xml | 2 -
.../camel-k-loader-yaml-support/pom.xml | 1 -
camel-k-loader-yaml/camel-k-loader-yaml/pom.xml | 2 -
camel-k-main/camel-k-runtime-health/pom.xml | 1 -
camel-k-main/camel-k-runtime-tracing/pom.xml | 1 -
camel-k-runtime-core/pom.xml | 1 -
camel-k-runtime-cron/pom.xml | 1 -
camel-k-runtime-http/pom.xml | 1 -
camel-k-runtime-knative/pom.xml | 1 -
camel-k-runtime-webhook/pom.xml | 1 -
camel-kamelet/pom.xml | 2 -
camel-knative/camel-knative-api/pom.xml | 1 -
camel-knative/camel-knative-http/pom.xml | 1 -
camel-knative/camel-knative/pom.xml | 2 -
pom.xml | 105 ++++++++++++++++++---
tooling/camel-k-catalog/pom.xml | 1 -
tooling/camel-k-maven-plugin/pom.xml | 16 +---
22 files changed, 91 insertions(+), 54 deletions(-)
diff --git a/camel-k-loader-groovy/pom.xml b/camel-k-loader-groovy/pom.xml
index c372d82..c9ed322 100644
--- a/camel-k-loader-groovy/pom.xml
+++ b/camel-k-loader-groovy/pom.xml
@@ -120,7 +120,6 @@
<plugin>
<groupId>org.codehaus.gmavenplus</groupId>
<artifactId>gmavenplus-plugin</artifactId>
- <version>${gmavenplus-plugin-version}</version>
<executions>
<execution>
<goals>
diff --git a/camel-k-loader-java/pom.xml b/camel-k-loader-java/pom.xml
index 80263c1..f10c5e3 100644
--- a/camel-k-loader-java/pom.xml
+++ b/camel-k-loader-java/pom.xml
@@ -112,7 +112,6 @@
<plugin>
<groupId>org.codehaus.gmavenplus</groupId>
<artifactId>gmavenplus-plugin</artifactId>
- <version>${gmavenplus-plugin-version}</version>
<executions>
<execution>
<goals>
diff --git a/camel-k-loader-js/pom.xml b/camel-k-loader-js/pom.xml
index 7ed8caa..c1d60d3 100644
--- a/camel-k-loader-js/pom.xml
+++ b/camel-k-loader-js/pom.xml
@@ -112,7 +112,6 @@
<plugin>
<groupId>org.codehaus.gmavenplus</groupId>
<artifactId>gmavenplus-plugin</artifactId>
- <version>${gmavenplus-plugin-version}</version>
<executions>
<execution>
<goals>
diff --git a/camel-k-loader-kotlin/camel-k-loader-kotlin/pom.xml b/camel-k-loader-kotlin/camel-k-loader-kotlin/pom.xml
index b910f6a..d218597 100644
--- a/camel-k-loader-kotlin/camel-k-loader-kotlin/pom.xml
+++ b/camel-k-loader-kotlin/camel-k-loader-kotlin/pom.xml
@@ -120,7 +120,6 @@
<plugin>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-maven-plugin</artifactId>
- <version>${kotlin-version}</version>
<configuration>
<jvmTarget>${maven.compiler.release}</jvmTarget>
</configuration>
diff --git a/camel-k-loader-xml/pom.xml b/camel-k-loader-xml/pom.xml
index 30134b7..a6bea70 100644
--- a/camel-k-loader-xml/pom.xml
+++ b/camel-k-loader-xml/pom.xml
@@ -109,7 +109,6 @@
<plugin>
<groupId>org.codehaus.gmavenplus</groupId>
<artifactId>gmavenplus-plugin</artifactId>
- <version>${gmavenplus-plugin-version}</version>
<executions>
<execution>
<goals>
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml-common/pom.xml b/camel-k-loader-yaml/camel-k-loader-yaml-common/pom.xml
index 6f49795..a8344f3 100644
--- a/camel-k-loader-yaml/camel-k-loader-yaml-common/pom.xml
+++ b/camel-k-loader-yaml/camel-k-loader-yaml-common/pom.xml
@@ -77,7 +77,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>${build-helper-maven-plugin-version}</version>
<executions>
<execution>
<phase>generate-sources</phase>
@@ -120,7 +119,6 @@
<plugin>
<groupId>org.codehaus.gmavenplus</groupId>
<artifactId>gmavenplus-plugin</artifactId>
- <version>${gmavenplus-plugin-version}</version>
<executions>
<execution>
<goals>
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml-support/pom.xml b/camel-k-loader-yaml/camel-k-loader-yaml-support/pom.xml
index bb1bd4d..5ead7d2 100644
--- a/camel-k-loader-yaml/camel-k-loader-yaml-support/pom.xml
+++ b/camel-k-loader-yaml/camel-k-loader-yaml-support/pom.xml
@@ -70,7 +70,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>${build-helper-maven-plugin-version}</version>
<executions>
<execution>
<phase>generate-sources</phase>
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/pom.xml b/camel-k-loader-yaml/camel-k-loader-yaml/pom.xml
index 8338862..738fe6f 100644
--- a/camel-k-loader-yaml/camel-k-loader-yaml/pom.xml
+++ b/camel-k-loader-yaml/camel-k-loader-yaml/pom.xml
@@ -130,7 +130,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>${build-helper-maven-plugin-version}</version>
<executions>
<execution>
<phase>generate-sources</phase>
@@ -201,7 +200,6 @@
<plugin>
<groupId>org.codehaus.gmavenplus</groupId>
<artifactId>gmavenplus-plugin</artifactId>
- <version>${gmavenplus-plugin-version}</version>
<executions>
<execution>
<goals>
diff --git a/camel-k-main/camel-k-runtime-health/pom.xml b/camel-k-main/camel-k-runtime-health/pom.xml
index 7efede3..4c3f380 100644
--- a/camel-k-main/camel-k-runtime-health/pom.xml
+++ b/camel-k-main/camel-k-runtime-health/pom.xml
@@ -123,7 +123,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>${build-helper-maven-plugin-version}</version>
<executions>
<execution>
<phase>generate-sources</phase>
diff --git a/camel-k-main/camel-k-runtime-tracing/pom.xml b/camel-k-main/camel-k-runtime-tracing/pom.xml
index 90da60e..fb399bb 100644
--- a/camel-k-main/camel-k-runtime-tracing/pom.xml
+++ b/camel-k-main/camel-k-runtime-tracing/pom.xml
@@ -110,7 +110,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>${build-helper-maven-plugin-version}</version>
<executions>
<execution>
<phase>generate-sources</phase>
diff --git a/camel-k-runtime-core/pom.xml b/camel-k-runtime-core/pom.xml
index 7394179..ce269d4 100644
--- a/camel-k-runtime-core/pom.xml
+++ b/camel-k-runtime-core/pom.xml
@@ -110,7 +110,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>${build-helper-maven-plugin-version}</version>
<executions>
<execution>
<phase>generate-sources</phase>
diff --git a/camel-k-runtime-cron/pom.xml b/camel-k-runtime-cron/pom.xml
index 743e269..1b692dc 100644
--- a/camel-k-runtime-cron/pom.xml
+++ b/camel-k-runtime-cron/pom.xml
@@ -125,7 +125,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>${build-helper-maven-plugin-version}</version>
<executions>
<execution>
<phase>generate-sources</phase>
diff --git a/camel-k-runtime-http/pom.xml b/camel-k-runtime-http/pom.xml
index 0eb70f2..5ead638 100644
--- a/camel-k-runtime-http/pom.xml
+++ b/camel-k-runtime-http/pom.xml
@@ -122,7 +122,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>${build-helper-maven-plugin-version}</version>
<executions>
<execution>
<phase>generate-sources</phase>
diff --git a/camel-k-runtime-knative/pom.xml b/camel-k-runtime-knative/pom.xml
index 7463637..63483d4 100644
--- a/camel-k-runtime-knative/pom.xml
+++ b/camel-k-runtime-knative/pom.xml
@@ -145,7 +145,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>${build-helper-maven-plugin-version}</version>
<executions>
<execution>
<phase>generate-sources</phase>
diff --git a/camel-k-runtime-webhook/pom.xml b/camel-k-runtime-webhook/pom.xml
index a51b080..540ffdc 100644
--- a/camel-k-runtime-webhook/pom.xml
+++ b/camel-k-runtime-webhook/pom.xml
@@ -134,7 +134,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>${build-helper-maven-plugin-version}</version>
<executions>
<execution>
<phase>generate-sources</phase>
diff --git a/camel-kamelet/pom.xml b/camel-kamelet/pom.xml
index 91cd445..0184884 100644
--- a/camel-kamelet/pom.xml
+++ b/camel-kamelet/pom.xml
@@ -101,7 +101,6 @@
<plugin>
<groupId>org.apache.camel</groupId>
<artifactId>camel-component-maven-plugin</artifactId>
- <version>${camel-version}</version>
<executions>
<execution>
<id>generate</id>
@@ -115,7 +114,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>${build-helper-maven-plugin-version}</version>
<executions>
<execution>
<phase>generate-sources</phase>
diff --git a/camel-knative/camel-knative-api/pom.xml b/camel-knative/camel-knative-api/pom.xml
index 1e11e7d..e995913 100644
--- a/camel-knative/camel-knative-api/pom.xml
+++ b/camel-knative/camel-knative-api/pom.xml
@@ -100,7 +100,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>${build-helper-maven-plugin-version}</version>
<executions>
<execution>
<phase>generate-sources</phase>
diff --git a/camel-knative/camel-knative-http/pom.xml b/camel-knative/camel-knative-http/pom.xml
index 2f2e8f5..f118982 100644
--- a/camel-knative/camel-knative-http/pom.xml
+++ b/camel-knative/camel-knative-http/pom.xml
@@ -122,7 +122,6 @@
<plugin>
<groupId>org.apache.camel</groupId>
<artifactId>camel-package-maven-plugin</artifactId>
- <version>${camel-version}</version>
<configuration>
<failFast>false</failFast>
</configuration>
diff --git a/camel-knative/camel-knative/pom.xml b/camel-knative/camel-knative/pom.xml
index f6a3701..738daf8 100644
--- a/camel-knative/camel-knative/pom.xml
+++ b/camel-knative/camel-knative/pom.xml
@@ -93,7 +93,6 @@
<plugin>
<groupId>org.apache.camel</groupId>
<artifactId>camel-component-maven-plugin</artifactId>
- <version>${camel-version}</version>
<executions>
<execution>
<id>generate</id>
@@ -120,7 +119,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>${build-helper-maven-plugin-version}</version>
<executions>
<execution>
<phase>generate-sources</phase>
diff --git a/pom.xml b/pom.xml
index 5429468..9e0300b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -87,6 +87,10 @@
<maven-resources-plugin-version>3.2.0</maven-resources-plugin-version>
<maven-site-plugin-version>3.9.1</maven-site-plugin-version>
<maven-pmd-plugin-version>3.13.0</maven-pmd-plugin-version>
+ <maven-plugin-plugin-version>3.6.0</maven-plugin-plugin-version>
+ <maven-version>3.6.3</maven-version>
+ <maven-plugin-tools-version>3.6.0</maven-plugin-tools-version>
+ <maven-shaded-version>3.1.0</maven-shaded-version>
</properties>
<developers>
@@ -256,6 +260,31 @@
<artifactId>camel-package-maven-plugin</artifactId>
<version>${camel-version}</version>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.gmavenplus</groupId>
+ <artifactId>gmavenplus-plugin</artifactId>
+ <version>${gmavenplus-plugin-version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.jetbrains.kotlin</groupId>
+ <artifactId>kotlin-maven-plugin</artifactId>
+ <version>${kotlin-version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>${build-helper-maven-plugin-version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>${maven-jar-plugin-version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-plugin-plugin</artifactId>
+ <version>${maven-plugin-plugin-version}</version>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
@@ -619,21 +648,10 @@
<groupId>org.graalvm.nativeimage</groupId>
<artifactId>svm</artifactId>
<version>${graalvm-version}</version>
+ <scope>provided</scope>
</dependency>
- <!-- misc -->
- <dependency>
- <groupId>io.rest-assured</groupId>
- <artifactId>rest-assured</artifactId>
- <version>${rest-assured-version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.awaitility</groupId>
- <artifactId>awaitility</artifactId>
- <version>${awaitility-version}</version>
- </dependency>
-
+ <!-- groovy -->
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy</artifactId>
@@ -660,6 +678,42 @@
<version>${groovy-version}</version>
</dependency>
+ <!-- misc -->
+ <dependency>
+ <groupId>io.rest-assured</groupId>
+ <artifactId>rest-assured</artifactId>
+ <version>${rest-assured-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.awaitility</groupId>
+ <artifactId>awaitility</artifactId>
+ <version>${awaitility-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.yaml</groupId>
+ <artifactId>snakeyaml</artifactId>
+ <version>${snakeyaml-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.vdurmont</groupId>
+ <artifactId>semver4j</artifactId>
+ <version>${semver4j-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.immutables</groupId>
+ <artifactId>value</artifactId>
+ <version>${immutables-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jandex</artifactId>
+ <version>${jandex-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.squareup</groupId>
+ <artifactId>javapoet</artifactId>
+ <version>${javapoet-version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
@@ -675,7 +729,6 @@
<artifactId>log4j-jcl</artifactId>
<version>${log4j2-version}</version>
</dependency>
-
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
@@ -686,7 +739,6 @@
<artifactId>junit-pioneer</artifactId>
<version>${junit-pioneer-version}</version>
</dependency>
-
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
@@ -697,6 +749,29 @@
<artifactId>hamcrest-core</artifactId>
<version>${hamcrest-version}</version>
</dependency>
+
+ <!-- maven -->
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-core</artifactId>
+ <version>${maven-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-annotations</artifactId>
+ <version>${maven-plugin-tools-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.shared</groupId>
+ <artifactId>maven-common-artifact-filters</artifactId>
+ <version>${maven-shaded-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <version>${maven-version}</version>
+ </dependency>
+
</dependencies>
</dependencyManagement>
diff --git a/tooling/camel-k-catalog/pom.xml b/tooling/camel-k-catalog/pom.xml
index 4bae7d7..5697825 100644
--- a/tooling/camel-k-catalog/pom.xml
+++ b/tooling/camel-k-catalog/pom.xml
@@ -32,7 +32,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>${build-helper-maven-plugin-version}</version>
<executions>
<execution>
<id>attach-artifacts</id>
diff --git a/tooling/camel-k-maven-plugin/pom.xml b/tooling/camel-k-maven-plugin/pom.xml
index e97a671..36c5d98 100644
--- a/tooling/camel-k-maven-plugin/pom.xml
+++ b/tooling/camel-k-maven-plugin/pom.xml
@@ -25,7 +25,7 @@
</parent>
<prerequisites>
- <maven>3.6.3</maven>
+ <maven>${maven-version}</maven>
</prerequisites>
<modelVersion>4.0.0</modelVersion>
@@ -43,7 +43,6 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
- <version>${maven-version}</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
@@ -54,7 +53,6 @@
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
- <version>${maven-plugin-tools-version}</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
@@ -65,7 +63,6 @@
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-common-artifact-filters</artifactId>
- <version>${maven-shaded-version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.maven</groupId>
@@ -80,7 +77,6 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
- <version>${maven-version}</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
@@ -112,7 +108,6 @@
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
- <version>${snakeyaml-version}</version>
</dependency>
<dependency>
@@ -131,35 +126,29 @@
<dependency>
<groupId>com.vdurmont</groupId>
<artifactId>semver4j</artifactId>
- <version>${semver4j-version}</version>
</dependency>
<dependency>
<groupId>org.immutables</groupId>
<artifactId>value</artifactId>
- <version>${immutables-version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jandex</artifactId>
- <version>${jandex-version}</version>
</dependency>
<dependency>
<groupId>com.squareup</groupId>
<artifactId>javapoet</artifactId>
- <version>${javapoet-version}</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
- <version>${junit-jupiter-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
- <version>${assertj-version}</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -169,7 +158,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>${maven-jar-plugin-version}</version>
<configuration>
<archive>
<manifest>
@@ -182,7 +170,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
- <version>3.6.0</version>
<configuration>
<mojoDependencies />
</configuration>
@@ -205,7 +192,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
- <version>${maven-invoker-plugin-version}</version>
<configuration>
<scriptVariables>
<runtimeVersion>${project.version}</runtimeVersion>