You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2021/08/02 04:19:51 UTC
[camel] branch main updated: CAMEL-16831: Upgrade to apache 24
parent. Upgrade felix bundle plugin and other maven plugins as this is
required by apache 24.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new bfc1f25 CAMEL-16831: Upgrade to apache 24 parent. Upgrade felix bundle plugin and other maven plugins as this is required by apache 24.
bfc1f25 is described below
commit bfc1f251dd097088cfd3f1deb0a2edfd8df01a7c
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Aug 2 06:18:48 2021 +0200
CAMEL-16831: Upgrade to apache 24 parent. Upgrade felix bundle plugin and other maven plugins as this is required by apache 24.
---
camel-dependencies/pom.xml | 12 ++++++------
parent/pom.xml | 12 ++++++------
pom.xml | 7 +++++--
3 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 4870789..b41def0 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -381,7 +381,7 @@
<maven-antrun-plugin-version>1.6</maven-antrun-plugin-version>
<maven-archetype-packaging-version>2.3</maven-archetype-packaging-version>
<maven-archetype-plugin-version>3.2.0</maven-archetype-plugin-version>
- <maven-assembly-plugin-version>3.0.0</maven-assembly-plugin-version>
+ <maven-assembly-plugin-version>3.3.0</maven-assembly-plugin-version>
<maven-checkstyle-plugin-version>3.1.2</maven-checkstyle-plugin-version>
<maven-checkstyle-version>8.43</maven-checkstyle-version>
<maven-jar-plugin-version>3.2.0</maven-jar-plugin-version>
@@ -389,16 +389,16 @@
<maven-jboss-as-maven-plugin-version>7.9.Final</maven-jboss-as-maven-plugin-version>
<maven-model-version>3.2.5</maven-model-version>
<maven-owasp-plugin-version>6.2.2</maven-owasp-plugin-version>
- <maven-plugin-annotations-version>3.6.0</maven-plugin-annotations-version>
- <maven-plugin-plugin-version>3.6.0</maven-plugin-plugin-version>
+ <maven-plugin-annotations-version>3.6.1</maven-plugin-annotations-version>
+ <maven-plugin-plugin-version>3.6.1</maven-plugin-plugin-version>
<maven-plugin-testing-harness-version>3.3.0</maven-plugin-testing-harness-version>
- <maven-remote-resources-plugin-version>1.5</maven-remote-resources-plugin-version>
+ <maven-remote-resources-plugin-version>1.7.0</maven-remote-resources-plugin-version>
<maven-reporting-api-version>2.2.1</maven-reporting-api-version>
<maven-reporting-impl-version>2.0.5</maven-reporting-impl-version>
<maven-resources-plugin-version>3.2.0</maven-resources-plugin-version>
- <maven-shade-plugin-version>3.2.1</maven-shade-plugin-version>
+ <maven-shade-plugin-version>3.2.3</maven-shade-plugin-version>
<maven-surefire-report-plugin-version>3.0.0-M4</maven-surefire-report-plugin-version>
- <maven-war-plugin-version>3.2.3</maven-war-plugin-version>
+ <maven-war-plugin-version>3.3.1</maven-war-plugin-version>
<metrics-version>4.1.22</metrics-version>
<micrometer-version>1.7.0</micrometer-version>
<microprofile-config-version>2.0</microprofile-config-version>
diff --git a/parent/pom.xml b/parent/pom.xml
index 960f30e..6b0c5bb4 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -365,7 +365,7 @@
<maven-antrun-plugin-version>1.6</maven-antrun-plugin-version>
<maven-archetype-plugin-version>3.2.0</maven-archetype-plugin-version>
<maven-archetype-packaging-version>2.3</maven-archetype-packaging-version>
- <maven-assembly-plugin-version>3.0.0</maven-assembly-plugin-version>
+ <maven-assembly-plugin-version>3.3.0</maven-assembly-plugin-version>
<maven-checkstyle-plugin-version>3.1.2</maven-checkstyle-plugin-version>
<maven-checkstyle-version>8.43</maven-checkstyle-version>
<maven-owasp-plugin-version>6.2.2</maven-owasp-plugin-version>
@@ -373,17 +373,17 @@
<maven-javadoc-plugin-version>3.2.0</maven-javadoc-plugin-version>
<maven-jboss-as-maven-plugin-version>7.9.Final</maven-jboss-as-maven-plugin-version>
<maven-model-version>3.2.5</maven-model-version>
- <maven-plugin-plugin-version>3.6.0</maven-plugin-plugin-version>
- <maven-plugin-annotations-version>3.6.0</maven-plugin-annotations-version>
+ <maven-plugin-plugin-version>3.6.1</maven-plugin-plugin-version>
+ <maven-plugin-annotations-version>3.6.1</maven-plugin-annotations-version>
<maven-plugin-testing-harness-version>3.3.0</maven-plugin-testing-harness-version>
- <maven-remote-resources-plugin-version>1.5</maven-remote-resources-plugin-version>
+ <maven-remote-resources-plugin-version>1.7.0</maven-remote-resources-plugin-version>
<!-- resources plugin needed by Camel maven archetypes -->
<maven-resources-plugin-version>3.2.0</maven-resources-plugin-version>
<maven-reporting-api-version>2.2.1</maven-reporting-api-version>
<maven-reporting-impl-version>2.0.5</maven-reporting-impl-version>
- <maven-shade-plugin-version>3.2.1</maven-shade-plugin-version>
+ <maven-shade-plugin-version>3.2.3</maven-shade-plugin-version>
<maven-surefire-report-plugin-version>3.0.0-M4</maven-surefire-report-plugin-version>
- <maven-war-plugin-version>3.2.3</maven-war-plugin-version>
+ <maven-war-plugin-version>3.3.1</maven-war-plugin-version>
<metrics-version>4.1.22</metrics-version>
<micrometer-version>1.7.0</micrometer-version>
<microprofile-config-version>2.0</microprofile-config-version>
diff --git a/pom.xml b/pom.xml
index fe9464b..b3fa762 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>23</version>
+ <version>24</version>
</parent>
<groupId>org.apache.camel</groupId>
@@ -112,6 +112,9 @@
<jdk.version>1.8</jdk.version>
<compiler.fork>false</compiler.fork>
+ <!-- reproduceable builds: https://maven.apache.org/guides/mini/guide-reproducible-builds.html -->
+ <project.build.outputTimestamp>1</project.build.outputTimestamp>
+
<maven-compiler-plugin-version>3.8.1</maven-compiler-plugin-version>
<maven-javadoc-plugin-version>3.2.0</maven-javadoc-plugin-version>
<maven-surefire-plugin-version>3.0.0-M5</maven-surefire-plugin-version>
@@ -121,7 +124,7 @@
<surefire.version>${maven-surefire-plugin-version}</surefire.version>
<formatter-maven-plugin.version>2.13.0</formatter-maven-plugin.version>
<java-diff-utils-version>4.7</java-diff-utils-version>
- <maven-bundle-plugin-version>4.2.1</maven-bundle-plugin-version>
+ <maven-bundle-plugin-version>5.1.2</maven-bundle-plugin-version>
<!-- eclipse plugin need the jaxb in this pom.xml file -->
<!-- Make sure to keep JAXB version up to date in parent/pom.xml in the bottom of the file -->