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 2023/06/03 17:11:20 UTC
[camel-karavan] 01/03: Add a karavan-parent to make it easier to maintain maven modules and align versions.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch parent
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
commit 2d46af429e02c1bf07b627f8a04cad000b03c053
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sat Jun 3 19:07:40 2023 +0200
Add a karavan-parent to make it easier to maintain maven modules and align versions.
---
.gitignore | 1 +
karavan-app/pom.xml | 47 +++++++----------
karavan-cli/pom.xml | 52 +++++++++++--------
karavan-generator/dependency-reduced-pom.xml | 75 ----------------------------
karavan-generator/pom.xml | 43 ++++++++--------
karavan-operator/pom.xml | 45 ++++++++++-------
karavan-parent/pom.xml | 61 ++++++++++++++++++++++
7 files changed, 160 insertions(+), 164 deletions(-)
diff --git a/.gitignore b/.gitignore
index ab2d8b70..c3f17321 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@ pom.xml.tag
pom.xml.releaseBackup
pom.xml.versionsBackup
release.properties
+dependency-reduced-pom.xml
# Eclipse
.project
diff --git a/karavan-app/pom.xml b/karavan-app/pom.xml
index 4860c09f..c308fa75 100644
--- a/karavan-app/pom.xml
+++ b/karavan-app/pom.xml
@@ -1,43 +1,36 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
+
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
+
http://www.apache.org/licenses/LICENSE-2.0
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
+
-->
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.camel.karavan</groupId>
- <version>3.20.2-SNAPSHOT</version>
- <artifactId>karavan</artifactId>
- <properties>
- <compiler-plugin.version>3.10.1</compiler-plugin.version>
- <maven.compiler.parameters>true</maven.compiler.parameters>
- <maven.compiler.source>11</maven.compiler.source>
- <maven.compiler.target>11</maven.compiler.target>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
- <quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>
- <quarkus.platform.version>2.16.7.Final</quarkus.platform.version>
- <camel-quarkus.version>2.16.0</camel-quarkus.version>
- <camel.version>3.20.4</camel.version>
- <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
- <infinispan.version>14.0.9.Final</infinispan.version>
- <tekton.version>6.3.1</tekton.version>
- <jgit.version>2.3.1</jgit.version>
- <quinoa.version>1.2.4</quinoa.version>
- </properties>
+
+ <parent>
+ <groupId>org.apache.camel.karavan</groupId>
+ <artifactId>karavan-parent</artifactId>
+ <version>3.20.2-SNAPSHOT</version>
+ <relativePath>../karavan-parent</relativePath>
+ </parent>
+
+ <artifactId>karavan-app</artifactId>
+ <packaging>jar</packaging>
+
<dependencyManagement>
<dependencies>
<dependency>
@@ -49,6 +42,7 @@
</dependency>
</dependencies>
</dependencyManagement>
+
<dependencies>
<dependency>
<groupId>io.quarkus</groupId>
@@ -115,10 +109,6 @@
<groupId>io.quarkus</groupId>
<artifactId>quarkus-qute</artifactId>
</dependency>
- <dependency>
- <groupId>io.quarkus</groupId>
- <artifactId>quarkus-scheduler</artifactId>
- </dependency>
<dependency>
<groupId>io.fabric8</groupId>
<artifactId>tekton-client</artifactId>
@@ -217,6 +207,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
+ <version>${resources-plugin.version}</version>
<configuration>
<nonFilteredFileExtensions>
<nonFilteredFileExtension>ico</nonFilteredFileExtension>
diff --git a/karavan-cli/pom.xml b/karavan-cli/pom.xml
index e1061877..fbe17a33 100644
--- a/karavan-cli/pom.xml
+++ b/karavan-cli/pom.xml
@@ -1,27 +1,35 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.camel.karavan</groupId>
+
+ <parent>
+ <groupId>org.apache.camel.karavan</groupId>
+ <artifactId>karavan-parent</artifactId>
+ <version>3.20.2-SNAPSHOT</version>
+ <relativePath>../karavan-parent</relativePath>
+ </parent>
+
<artifactId>karavan-cli</artifactId>
- <name>karavan-cli</name>
- <version>3.20.2-SNAPSHOT</version>
<packaging>jar</packaging>
- <properties>
- <compiler-plugin.version>3.8.1</compiler-plugin.version>
- <surefire-plugin.version>3.0.0-M9</surefire-plugin.version>
- <maven.compiler.parameters>true</maven.compiler.parameters>
- <maven.compiler.source>11</maven.compiler.source>
- <maven.compiler.target>11</maven.compiler.target>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <kubernetes-client.version>6.3.1</kubernetes-client.version>
- <picocli.version>4.7.3</picocli.version>
- <log4j-version>2.20.0</log4j-version>
- <slf4j-api-version>2.0.6</slf4j-api-version>
- <log4j2-version>2.20.0</log4j2-version>
- </properties>
<dependencies>
<dependency>
@@ -72,7 +80,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>3.4.1</version>
+ <version>${maven-shade-plugin.version}</version>
<configuration>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
@@ -93,7 +101,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<!-- annotationProcessorPaths requires maven-compiler-plugin version 3.5 or higher -->
- <version>3.11.0</version>
+ <version>${compiler-plugin.version}</version>
<configuration>
<annotationProcessorPaths>
<path>
diff --git a/karavan-generator/dependency-reduced-pom.xml b/karavan-generator/dependency-reduced-pom.xml
deleted file mode 100644
index ac053c02..00000000
--- a/karavan-generator/dependency-reduced-pom.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.camel.karavan</groupId>
- <artifactId>karavan-generator</artifactId>
- <version>3.20.1-SNAPSHOT</version>
- <build>
- <resources>
- <resource>
- <filtering>true</filtering>
- <directory>src/main/resources</directory>
- <includes>
- <include>**/**</include>
- </includes>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.10.1</version>
- <configuration>
- <source>11</source>
- <target>11</target>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-shade-plugin</artifactId>
- <version>3.4.1</version>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.4</version>
- <configuration>
- <archive>
- <manifest>
- <addClasspath>true</addClasspath>
- <mainClass>org.apache.camel.karavan.generator.KaravanGenerator</mainClass>
- </manifest>
- </archive>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <repositories>
- <repository>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots />
- <id>apache.snapshots</id>
- <name>Apache Development Snapshot Repository</name>
- <url>https://repository.apache.org/content/repositories/snapshots/</url>
- </repository>
- </repositories>
- <properties>
- <maven.compiler.source>11</maven.compiler.source>
- <version.camel-kamelet>3.20.1.1</version.camel-kamelet>
- <compiler-plugin.version>3.8.1</compiler-plugin.version>
- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <version.vertx>4.3.6</version.vertx>
- <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
- <maven.compiler.target>11</maven.compiler.target>
- <version.camel-core>3.20.2</version.camel-core>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <maven.compiler.parameters>true</maven.compiler.parameters>
- </properties>
-</project>
diff --git a/karavan-generator/pom.xml b/karavan-generator/pom.xml
index 279cd3b0..5dddfc33 100644
--- a/karavan-generator/pom.xml
+++ b/karavan-generator/pom.xml
@@ -1,37 +1,36 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
+
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
+
http://www.apache.org/licenses/LICENSE-2.0
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
+
-->
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.camel.karavan</groupId>
+
+ <parent>
+ <groupId>org.apache.camel.karavan</groupId>
+ <artifactId>karavan-parent</artifactId>
+ <version>3.20.2-SNAPSHOT</version>
+ <relativePath>../karavan-parent</relativePath>
+ </parent>
+
<artifactId>karavan-generator</artifactId>
- <version>3.20.2-SNAPSHOT</version>
- <properties>
- <compiler-plugin.version>3.8.1</compiler-plugin.version>
- <maven.compiler.parameters>true</maven.compiler.parameters>
- <maven.compiler.source>11</maven.compiler.source>
- <maven.compiler.target>11</maven.compiler.target>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
- <version.camel-core>3.20.4</version.camel-core>
- <version.camel-kamelet>3.20.3</version.camel-kamelet>
- <version.vertx>4.3.6</version.vertx>
- </properties>
+ <packaging>jar</packaging>
+
<dependencies>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -72,16 +71,16 @@
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.10.1</version>
+ <version>${compiler-plugin.version}</version>
<configuration>
- <source>11</source>
- <target>11</target>
+ <source>${maven.compiler.source}</source>
+ <target>${maven.compiler.target}</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>3.4.1</version>
+ <version>${maven-shade-plugin.version}</version>
<executions>
<execution>
<phase>package</phase>
@@ -94,7 +93,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.4</version>
+ <version>${maven-jar-plugin.version}</version>
<configuration>
<archive>
<manifest>
diff --git a/karavan-operator/pom.xml b/karavan-operator/pom.xml
index 16a29818..6a8b9b1c 100644
--- a/karavan-operator/pom.xml
+++ b/karavan-operator/pom.xml
@@ -1,24 +1,35 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.camel.karavan</groupId>
+
+ <parent>
+ <groupId>org.apache.camel.karavan</groupId>
+ <artifactId>karavan-parent</artifactId>
+ <version>3.20.2-SNAPSHOT</version>
+ <relativePath>../karavan-parent</relativePath>
+ </parent>
+
<artifactId>karavan-operator</artifactId>
- <name>karavan-operator</name>
- <version>3.20.2-SNAPSHOT</version>
<packaging>jar</packaging>
- <properties>
- <compiler-plugin.version>3.8.1</compiler-plugin.version>
- <surefire-plugin.version>3.0.0-M9</surefire-plugin.version>
- <maven.compiler.parameters>true</maven.compiler.parameters>
- <maven.compiler.source>11</maven.compiler.source>
- <maven.compiler.target>11</maven.compiler.target>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <quarkus-sdk.version>5.1.1</quarkus-sdk.version>
- <quarkus.version>2.16.7.Final</quarkus.version>
- </properties>
<dependencyManagement>
<dependencies>
diff --git a/karavan-parent/pom.xml b/karavan-parent/pom.xml
new file mode 100644
index 00000000..1f091668
--- /dev/null
+++ b/karavan-parent/pom.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.camel.karavan</groupId>
+ <version>3.20.2-SNAPSHOT</version>
+ <artifactId>karavan-parent</artifactId>
+ <packaging>pom</packaging>
+
+ <properties>
+ <compiler-plugin.version>3.10.1</compiler-plugin.version>
+ <maven.compiler.parameters>true</maven.compiler.parameters>
+ <maven.compiler.source>11</maven.compiler.source>
+ <maven.compiler.target>11</maven.compiler.target>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
+ <quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>
+ <quarkus.platform.version>2.16.7.Final</quarkus.platform.version>
+ <camel-quarkus.version>2.16.0</camel-quarkus.version>
+ <camel.version>3.20.4</camel.version>
+ <version.camel-core>3.20.4</version.camel-core>
+ <version.camel-kamelet>3.20.3</version.camel-kamelet>
+ <version.vertx>4.3.6</version.vertx>
+ <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
+ <infinispan.version>14.0.9.Final</infinispan.version>
+ <tekton.version>6.3.1</tekton.version>
+ <jgit.version>2.3.1</jgit.version>
+ <quinoa.version>1.2.4</quinoa.version>
+ <resources-plugin.version>3.3.0</resources-plugin.version>
+ <kubernetes-client.version>6.3.1</kubernetes-client.version>
+ <picocli.version>4.7.3</picocli.version>
+ <log4j-version>2.20.0</log4j-version>
+ <slf4j-api-version>2.0.6</slf4j-api-version>
+ <log4j2-version>2.20.0</log4j2-version>
+ <maven-shade-plugin.version>3.4.1</maven-shade-plugin.version>
+ <maven-jar-plugin.version>2.4</maven-jar-plugin.version>
+ <quarkus-sdk.version>5.1.1</quarkus-sdk.version>
+ <quarkus.version>2.16.7.Final</quarkus.version>
+ </properties>
+
+</project>