This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch camel-3.4.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.4.x by this push:
new 342d047 Fix minor issues in camel maven archetypes (#3996)
342d047 is described below
commit 342d04735038cbb28b762baf1b59738876aa1ec0
Author: Ahmed <[email protected]>
AuthorDate: Mon Jul 13 07:12:51 2020 +0200
Fix minor issues in camel maven archetypes (#3996)
camel-archetype-api-component:
- Add camel-test-junit5 test dependency to fix build failures
in generated test sources
- Remove deprecated log4j.version property
camel-archetype-component and camel-archetype-dataformat:
- Fix missing plugin version WARNING for build-helper-maven-plugin
by adding a new property build-helper-maven-plugin-version
---
.../main/resources-filtered/META-INF/maven/archetype-metadata.xml | 3 ---
.../resources/archetype-resources/__artifactId__-component/pom.xml | 5 +++++
.../main/resources-filtered/META-INF/maven/archetype-metadata.xml | 3 +++
.../src/main/resources/archetype-resources/pom.xml | 1 +
.../main/resources-filtered/META-INF/maven/archetype-metadata.xml | 3 +++
.../src/main/resources/archetype-resources/pom.xml | 1 +
6 files changed, 13 insertions(+), 3 deletions(-)
diff --git
a/archetypes/camel-archetype-api-component/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
b/archetypes/camel-archetype-api-component/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
index 87ff671..62f80fc 100644
---
a/archetypes/camel-archetype-api-component/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
+++
b/archetypes/camel-archetype-api-component/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
@@ -27,9 +27,6 @@
<requiredProperty key="camel-version">
<defaultValue>${project.version}</defaultValue>
</requiredProperty>
- <requiredProperty key="log4j-version">
- <defaultValue>${log4j-version}</defaultValue>
- </requiredProperty>
<requiredProperty key="maven-compiler-plugin-version">
<defaultValue>${maven-compiler-plugin-version}</defaultValue>
</requiredProperty>
diff --git
a/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/pom.xml
b/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/pom.xml
index 0c40739..56af557 100644
---
a/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/pom.xml
+++
b/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/pom.xml
@@ -73,6 +73,11 @@
<artifactId>camel-test</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-test-junit5</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
diff --git
a/archetypes/camel-archetype-component/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
b/archetypes/camel-archetype-component/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
index ca6ce58..d0d0fc7 100644
---
a/archetypes/camel-archetype-component/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
+++
b/archetypes/camel-archetype-component/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
@@ -35,6 +35,9 @@
<requiredProperty key="maven-resources-plugin-version">
<defaultValue>${maven-resources-plugin-version}</defaultValue>
</requiredProperty>
+ <requiredProperty key="build-helper-maven-plugin-version">
+ <defaultValue>${build-helper-maven-plugin-version}</defaultValue>
+ </requiredProperty>
<requiredProperty key="slf4j-version">
<defaultValue>${slf4j-version}</defaultValue>
</requiredProperty>
diff --git
a/archetypes/camel-archetype-component/src/main/resources/archetype-resources/pom.xml
b/archetypes/camel-archetype-component/src/main/resources/archetype-resources/pom.xml
index 185a5f5..7000fd5 100644
---
a/archetypes/camel-archetype-component/src/main/resources/archetype-resources/pom.xml
+++
b/archetypes/camel-archetype-component/src/main/resources/archetype-resources/pom.xml
@@ -110,6 +110,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
+ <version>${build-helper-maven-plugin-version}</version>
<executions>
<execution>
<phase>initialize</phase>
diff --git
a/archetypes/camel-archetype-dataformat/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
b/archetypes/camel-archetype-dataformat/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
index e89a350..d2cf1893 100644
---
a/archetypes/camel-archetype-dataformat/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
+++
b/archetypes/camel-archetype-dataformat/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
@@ -35,6 +35,9 @@
<requiredProperty key="maven-resources-plugin-version">
<defaultValue>${maven-resources-plugin-version}</defaultValue>
</requiredProperty>
+ <requiredProperty key="build-helper-maven-plugin-version">
+ <defaultValue>${build-helper-maven-plugin-version}</defaultValue>
+ </requiredProperty>
<requiredProperty key="slf4j-version">
<defaultValue>${slf4j-version}</defaultValue>
</requiredProperty>
diff --git
a/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/pom.xml
b/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/pom.xml
index ea961e1..b88ca2f 100644
---
a/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/pom.xml
+++
b/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/pom.xml
@@ -109,6 +109,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
+ <version>${build-helper-maven-plugin-version}</version>
<executions>
<execution>
<phase>initialize</phase>
