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/05/22 09:00:23 UTC

[camel] 02/02: Archetypes: Avoid usage of camel-parent

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.git

commit 5b9b8ad6972e888670abd108434799e15159436d
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri May 22 10:59:29 2020 +0200

    Archetypes: Avoid usage of camel-parent
---
 .../src/main/resources/archetype-resources/pom.xml               | 1 +
 .../src/main/resources/archetype-resources/pom.xml               | 9 ++-------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/archetypes/camel-archetype-cdi/src/main/resources/archetype-resources/pom.xml b/archetypes/camel-archetype-cdi/src/main/resources/archetype-resources/pom.xml
index 683ec2f..7d7d271 100644
--- a/archetypes/camel-archetype-cdi/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/camel-archetype-cdi/src/main/resources/archetype-resources/pom.xml
@@ -33,6 +33,7 @@
     <deltaspike-version>1.9.0</deltaspike-version>
     <weld3-version>3.0.5.Final</weld3-version>
     <log4j2-version>2.13.3</log4j2-version>
+    <cdi-api-version>2.0</cdi-api-version>
   </properties>
 
   <dependencyManagement>
diff --git a/archetypes/camel-archetype-java/src/main/resources/archetype-resources/pom.xml b/archetypes/camel-archetype-java/src/main/resources/archetype-resources/pom.xml
index 89081ca..f790759 100644
--- a/archetypes/camel-archetype-java/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/camel-archetype-java/src/main/resources/archetype-resources/pom.xml
@@ -30,6 +30,7 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+    <log4j2-version>2.13.3</log4j2-version>
   </properties>
 
   <dependencyManagement>
@@ -42,13 +43,6 @@
         <scope>import</scope>
         <type>pom</type>
       </dependency>
-      <dependency>
-        <groupId>org.apache.camel</groupId>
-        <artifactId>camel-parent</artifactId>
-        <version>${camel-version}</version>
-        <scope>import</scope>
-        <type>pom</type>
-      </dependency>
     </dependencies>
   </dependencyManagement>
 
@@ -68,6 +62,7 @@
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-slf4j-impl</artifactId>
       <scope>runtime</scope>
+      <version>${log4j2-version}</version>
     </dependency>
 
     <!-- testing -->