This is an automated email from the ASF dual-hosted git repository.
valdar pushed a commit to branch camel-kafka-connector-4.0.x
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git
commit 59713f8f04644aa824647886430481ddd9ce5d80
Author: Andrea Tarocchi <andrea.taroc...@gmail.com>
AuthorDate: Tue Sep 19 15:04:55 2023 +0200
Fixed dependency and plugin versions
---
.../camel-kafka-connector-extensible-apicurio-archetype/pom.xml | 2 +-
.../src/main/resources/archetype-resources/pom.xml | 8 ++++----
archetypes/camel-kafka-connector-extensible-archetype/pom.xml | 2 +-
.../src/main/resources/archetype-resources/pom.xml | 8 ++++----
.../camel-kafka-connector-extensible-dataformat-archetype/pom.xml | 2 +-
.../src/main/resources/archetype-resources/pom.xml | 8 ++++----
connectors/camel-syslog-kafka-connector/pom.xml | 2 +-
connectors/pom.xml | 2 +-
connectors/template-connecotr-kamelet-pom.xml | 6 +++---
connectors/template-connector-pom.xml | 8 ++++----
core/pom.xml | 8 ++++----
distribution/pom.xml | 4 ++--
pom.xml | 2 +-
.../camel-kafka-connector-catalog-descriptor-maven-plugin/pom.xml | 4 ----
tooling/camel-kafka-connector-docs-maven-plugin/pom.xml | 4 ----
tooling/camel-kafka-connector-generator-maven-plugin/pom.xml | 5 ++---
.../src/test/resources/template-connector-pom.xml | 8 ++++----
tooling/pom.xml | 7 ++++---
18 files changed, 41 insertions(+), 49 deletions(-)
diff --git
a/archetypes/camel-kafka-connector-extensible-apicurio-archetype/pom.xml
b/archetypes/camel-kafka-connector-extensible-apicurio-archetype/pom.xml
index 915e44413..744602d75 100644
--- a/archetypes/camel-kafka-connector-extensible-apicurio-archetype/pom.xml
+++ b/archetypes/camel-kafka-connector-extensible-apicurio-archetype/pom.xml
@@ -37,7 +37,7 @@
<extension>
<groupId>org.apache.maven.archetype</groupId>
<artifactId>archetype-packaging</artifactId>
- <version>3.2.0</version>
+ <version>3.2.1</version>
</extension>
</extensions>
diff --git
a/archetypes/camel-kafka-connector-extensible-apicurio-archetype/src/main/resources/archetype-resources/pom.xml
b/archetypes/camel-kafka-connector-extensible-apicurio-archetype/src/main/resources/archetype-resources/pom.xml
index c260092c5..a2cf72ac3 100644
---
a/archetypes/camel-kafka-connector-extensible-apicurio-archetype/src/main/resources/archetype-resources/pom.xml
+++
b/archetypes/camel-kafka-connector-extensible-apicurio-archetype/src/main/resources/archetype-resources/pom.xml
@@ -102,16 +102,16 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.5.1</version>
+ <version>3.8.1</version>
<inherited>true</inherited>
<configuration>
- <source>1.8</source>
- <target>1.8</target>
+ <source>17</source>
+ <target>17</target>
</configuration>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.5.3</version>
+ <version>3.3.0</version>
<configuration>
<descriptors>
<descriptor>src/main/assembly/package.xml</descriptor>
diff --git a/archetypes/camel-kafka-connector-extensible-archetype/pom.xml
b/archetypes/camel-kafka-connector-extensible-archetype/pom.xml
index 9b969d1ad..364392fb7 100644
--- a/archetypes/camel-kafka-connector-extensible-archetype/pom.xml
+++ b/archetypes/camel-kafka-connector-extensible-archetype/pom.xml
@@ -46,7 +46,7 @@
<extension>
<groupId>org.apache.maven.archetype</groupId>
<artifactId>archetype-packaging</artifactId>
- <version>3.2.0</version>
+ <version>3.2.1</version>
</extension>
</extensions>
diff --git
a/archetypes/camel-kafka-connector-extensible-archetype/src/main/resources/archetype-resources/pom.xml
b/archetypes/camel-kafka-connector-extensible-archetype/src/main/resources/archetype-resources/pom.xml
index 193eac795..20f2f4a0a 100644
---
a/archetypes/camel-kafka-connector-extensible-archetype/src/main/resources/archetype-resources/pom.xml
+++
b/archetypes/camel-kafka-connector-extensible-archetype/src/main/resources/archetype-resources/pom.xml
@@ -90,16 +90,16 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.5.1</version>
+ <version>3.8.1</version>
<inherited>true</inherited>
<configuration>
- <source>1.8</source>
- <target>1.8</target>
+ <source>17</source>
+ <target>17</target>
</configuration>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.5.3</version>
+ <version>3.3.0</version>
<configuration>
<descriptors>
<descriptor>src/main/assembly/package.xml</descriptor>
diff --git
a/archetypes/camel-kafka-connector-extensible-dataformat-archetype/pom.xml
b/archetypes/camel-kafka-connector-extensible-dataformat-archetype/pom.xml
index b1fa9ca47..2612e6885 100644
--- a/archetypes/camel-kafka-connector-extensible-dataformat-archetype/pom.xml
+++ b/archetypes/camel-kafka-connector-extensible-dataformat-archetype/pom.xml
@@ -37,7 +37,7 @@
<extension>
<groupId>org.apache.maven.archetype</groupId>
<artifactId>archetype-packaging</artifactId>
- <version>3.2.0</version>
+ <version>3.2.1</version>
</extension>
</extensions>
diff --git
a/archetypes/camel-kafka-connector-extensible-dataformat-archetype/src/main/resources/archetype-resources/pom.xml
b/archetypes/camel-kafka-connector-extensible-dataformat-archetype/src/main/resources/archetype-resources/pom.xml
index 3717fa2e1..5c77f3026 100644
---
a/archetypes/camel-kafka-connector-extensible-dataformat-archetype/src/main/resources/archetype-resources/pom.xml
+++
b/archetypes/camel-kafka-connector-extensible-dataformat-archetype/src/main/resources/archetype-resources/pom.xml
@@ -96,16 +96,16 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.5.1</version>
+ <version>3.8.1</version>
<inherited>true</inherited>
<configuration>
- <source>1.8</source>
- <target>1.8</target>
+ <source>17</source>
+ <target>17</target>
</configuration>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.5.3</version>
+ <version>3.3.0</version>
<configuration>
<descriptors>
<descriptor>src/main/assembly/package.xml</descriptor>
diff --git a/connectors/camel-syslog-kafka-connector/pom.xml
b/connectors/camel-syslog-kafka-connector/pom.xml
index 50b47bf49..52952bcf1 100644
--- a/connectors/camel-syslog-kafka-connector/pom.xml
+++ b/connectors/camel-syslog-kafka-connector/pom.xml
@@ -130,7 +130,7 @@
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.5.3</version>
+ <version>3.3.0</version>
<configuration>
<descriptors>
<descriptor>src/main/assembly/package.xml</descriptor>
diff --git a/connectors/pom.xml b/connectors/pom.xml
index 216db1b6c..9052a78e3 100644
--- a/connectors/pom.xml
+++ b/connectors/pom.xml
@@ -96,7 +96,7 @@
<filter>netty,https,netty-http,couchbase,cxf,cxfrs,file,hdfs,jdbc,sjms2,sql,aws2-iam,aws2-kms,cassandraql</filter>
<!-- Regenerate connector pom file completely even if one
already exists -->
<!-- WARNING: you may lose some changes done to the pom.
-->
- <!-- <overridePomFile>false</overridePomFile> -->
+ <!-- <overridePomFile>true</overridePomFile>-->
<initialPomTemplate>${project.basedir}/template-connector-pom.xml</initialPomTemplate>
<initialKameletPomTemplate>${project.basedir}/template-connecotr-kamelet-pom.xml</initialKameletPomTemplate>
<noticeTemplate>${project.basedir}/camel-kafka-connector-NOTICE.txt</noticeTemplate>
diff --git a/connectors/template-connecotr-kamelet-pom.xml
b/connectors/template-connecotr-kamelet-pom.xml
index 927ffdbfa..ecf0f92c0 100644
--- a/connectors/template-connecotr-kamelet-pom.xml
+++ b/connectors/template-connecotr-kamelet-pom.xml
@@ -75,11 +75,11 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.5.1</version>
+
<version><#noparse>${version.maven.compiler}</#noparse></version>
<inherited>true</inherited>
<configuration>
- <source>1.8</source>
- <target>1.8</target>
+ <source><#noparse>${version.java}</#noparse></source>
+ <target><#noparse>${version.java}</#noparse></target>
</configuration>
</plugin>
<plugin>
diff --git a/connectors/template-connector-pom.xml
b/connectors/template-connector-pom.xml
index df3eb0e38..a0db19374 100644
--- a/connectors/template-connector-pom.xml
+++ b/connectors/template-connector-pom.xml
@@ -79,16 +79,16 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.5.1</version>
+
<version><#noparse>${version.maven.compiler}</#noparse></version>
<inherited>true</inherited>
<configuration>
- <source>1.8</source>
- <target>1.8</target>
+ <source><#noparse>${version.java}</#noparse></source>
+ <target><#noparse>${version.java}</#noparse></target>
</configuration>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.5.3</version>
+ <version>3.3.0</version>
<configuration>
<descriptors>
<descriptor>src/main/assembly/package.xml</descriptor>
diff --git a/core/pom.xml b/core/pom.xml
index 8ec639577..a7c8e4236 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -215,16 +215,16 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.5.1</version>
+ <version>${version.maven.compiler}</version>
<inherited>true</inherited>
<configuration>
- <source>1.8</source>
- <target>1.8</target>
+ <source>${version.java}</source>
+ <target>${version.java}</target>
</configuration>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.5.3</version>
+ <version>${maven-assembly-plugin.version}</version>
<configuration>
<descriptors>
<descriptor>src/main/assembly/package.xml</descriptor>
diff --git a/distribution/pom.xml b/distribution/pom.xml
index d597db59f..0333c435a 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -49,7 +49,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>${maven-assembly-plugin-version}</version>
+ <version>${maven-assembly-plugin.version}</version>
<executions>
<execution>
<id>source-release</id>
@@ -78,7 +78,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>${maven-assembly-plugin-version}</version>
+ <version>${maven-assembly-plugin.version}</version>
<executions>
<execution>
<id>binary-release</id>
diff --git a/pom.xml b/pom.xml
index 641df4255..8a3dafd6f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,7 +41,7 @@
<maven-deploy-plugin.version>3.0.0-M1</maven-deploy-plugin.version>
<maven-surefire-plugin.version>3.0.0-M4</maven-surefire-plugin.version>
<maven-javadoc-plugin.version>3.1.1</maven-javadoc-plugin.version>
- <maven-assembly-plugin.version>3.1.1</maven-assembly-plugin.version>
+ <maven-assembly-plugin.version>3.3.0</maven-assembly-plugin.version>
<maven-source-plugin.version>3.1.0</maven-source-plugin.version>
<maven-checksum-maven-plugin.version>1.7</maven-checksum-maven-plugin.version>
</properties>
diff --git
a/tooling/camel-kafka-connector-catalog-descriptor-maven-plugin/pom.xml
b/tooling/camel-kafka-connector-catalog-descriptor-maven-plugin/pom.xml
index d57c78706..107875be4 100644
--- a/tooling/camel-kafka-connector-catalog-descriptor-maven-plugin/pom.xml
+++ b/tooling/camel-kafka-connector-catalog-descriptor-maven-plugin/pom.xml
@@ -31,10 +31,6 @@
<packaging>maven-plugin</packaging>
<name>Camel-Kafka-Connector :: Tooling :: Catalog Descriptor Maven
Plugin</name>
- <properties>
- <maven-version>3.6.3</maven-version>
- </properties>
-
<dependencyManagement>
<dependencies>
<dependency>
diff --git a/tooling/camel-kafka-connector-docs-maven-plugin/pom.xml
b/tooling/camel-kafka-connector-docs-maven-plugin/pom.xml
index ca8adc0ac..c77faa01b 100644
--- a/tooling/camel-kafka-connector-docs-maven-plugin/pom.xml
+++ b/tooling/camel-kafka-connector-docs-maven-plugin/pom.xml
@@ -31,10 +31,6 @@
<packaging>maven-plugin</packaging>
<name>Camel-Kafka-Connector :: Tooling :: Docs Maven Plugin</name>
- <properties>
- <maven-version>3.6.3</maven-version>
- </properties>
-
<dependencyManagement>
<dependencies>
<dependency>
diff --git a/tooling/camel-kafka-connector-generator-maven-plugin/pom.xml
b/tooling/camel-kafka-connector-generator-maven-plugin/pom.xml
index 08d6e9009..95501e8da 100644
--- a/tooling/camel-kafka-connector-generator-maven-plugin/pom.xml
+++ b/tooling/camel-kafka-connector-generator-maven-plugin/pom.xml
@@ -32,7 +32,6 @@
<name>Camel-Kafka-Connector :: Generator Maven Plugin</name>
<properties>
- <maven-version>3.8.8</maven-version>
<classgraph.version>4.8.110</classgraph.version>
</properties>
@@ -153,7 +152,7 @@
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
- <version>3.6.0</version>
+ <version>3.8.2</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
@@ -163,7 +162,7 @@
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-dependency-tree</artifactId>
- <version>3.0.1</version>
+ <version>3.2.1</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
diff --git
a/tooling/camel-kafka-connector-generator-maven-plugin/src/test/resources/template-connector-pom.xml
b/tooling/camel-kafka-connector-generator-maven-plugin/src/test/resources/template-connector-pom.xml
index f09322496..f4df45990 100644
---
a/tooling/camel-kafka-connector-generator-maven-plugin/src/test/resources/template-connector-pom.xml
+++
b/tooling/camel-kafka-connector-generator-maven-plugin/src/test/resources/template-connector-pom.xml
@@ -79,16 +79,16 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.5.1</version>
+ <version>3.8.1</version>
<inherited>true</inherited>
<configuration>
- <source>1.8</source>
- <target>1.8</target>
+ <source>17</source>
+ <target>17</target>
</configuration>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.5.3</version>
+ <version>3.3.0</version>
<configuration>
<descriptors>
<descriptor>src/main/assembly/package.xml</descriptor>
diff --git a/tooling/pom.xml b/tooling/pom.xml
index 08327eaf4..42b9e18d4 100644
--- a/tooling/pom.xml
+++ b/tooling/pom.xml
@@ -40,9 +40,10 @@
</modules>
<properties>
- <jdk.version>17</jdk.version>
<compiler.fork>false</compiler.fork>
+ <maven-version>3.8.8</maven-version>
+
<asciidoctorj-version>2.1.0</asciidoctorj-version>
<freemarker-version>2.3.29</freemarker-version>
<gson-version>2.8.5</gson-version>
@@ -60,7 +61,7 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>${version.maven.compiler}</version>
<configuration>
- <release>${jdk.version}</release>
+ <release>${version.java}</release>
<maxmem>512M</maxmem>
<fork>${compiler.fork}</fork>
</configuration>
@@ -70,7 +71,7 @@
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<attach>true</attach>
- <source>${jdk.version}</source>
+ <source>${version.java}</source>
<quiet>true</quiet>
<bottom>Apache Camel</bottom>
<detectOfflineLinks>false</detectOfflineLinks>
