You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gn...@apache.org on 2020/02/18 06:27:27 UTC
[camel] branch master updated: Attempt to fix release problem
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 3e11162 Attempt to fix release problem
3e11162 is described below
commit 3e11162321dd244525fb499d832640aedb882c3f
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Tue Feb 18 07:27:03 2020 +0100
Attempt to fix release problem
---
.../main/resources/archetype-resources/__artifactId__-component/pom.xml | 2 +-
.../src/main/resources/archetype-resources/pom.xml | 2 +-
.../src/main/resources/archetype-resources/pom.xml | 2 +-
.../src/main/resources/archetype-resources/pom.xml | 2 +-
catalog/pom.xml | 2 +-
components/pom.xml | 2 +-
core/camel-caffeine-lrucache/pom.xml | 2 +-
core/pom.xml | 2 +-
parent/pom.xml | 1 -
platforms/commands/commands-core/pom.xml | 2 +-
tests/pom.xml | 2 +-
tests/test-bundles/pom.xml | 2 +-
tooling/camel-tooling-model/pom.xml | 2 +-
tooling/camel-tooling-util/pom.xml | 2 +-
tooling/camel-util-json/pom.xml | 2 +-
tooling/openapi-rest-dsl-generator/pom.xml | 2 +-
tooling/spi-annotations/pom.xml | 2 +-
tooling/swagger-rest-dsl-generator/pom.xml | 2 +-
18 files changed, 17 insertions(+), 18 deletions(-)
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 05cddf7..98cf35c 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
@@ -242,7 +242,7 @@
<plugin>
<groupId>org.apache.camel</groupId>
<artifactId>camel-bundle-plugin</artifactId>
- <version>${camel-bundle-plugin-version}</version>
+ <version>${camelVersion}</version>
<configuration>
<instructions>
<Bundle-Name>Camel Component for ${componentName}</Bundle-Name>
diff --git a/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/pom.xml b/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/pom.xml
index 15c785e..d8e7812 100644
--- a/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/pom.xml
@@ -109,7 +109,7 @@
<plugin>
<groupId>org.apache.camel</groupId>
<artifactId>camel-bundle-plugin</artifactId>
- <version>${camel-bundle-plugin-version}</version>
+ <version>${camelVersion}</version>
<extensions>false</extensions>
<executions>
<execution>
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 a726c96..641bae8 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
@@ -147,7 +147,7 @@
<plugin>
<groupId>org.apache.camel</groupId>
<artifactId>camel-bundle-plugin</artifactId>
- <version>${camel-bundle-plugin-version}</version>
+ <version>${camelVersion}</version>
<configuration>
<instructions>
<Bundle-SymbolicName>${groupId}.${artifactId}</Bundle-SymbolicName>
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 5350ba8..a82a18b 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
@@ -104,7 +104,7 @@
<plugin>
<groupId>org.apache.camel</groupId>
<artifactId>camel-bundle-plugin</artifactId>
- <version>${camel-bundle-plugin-version}</version>
+ <version>${camelVersion}</version>
<configuration>
<instructions>
<Bundle-SymbolicName>${groupId}.${artifactId}</Bundle-SymbolicName>
diff --git a/catalog/pom.xml b/catalog/pom.xml
index ed26c65..6bea544 100644
--- a/catalog/pom.xml
+++ b/catalog/pom.xml
@@ -61,7 +61,7 @@
<plugin>
<groupId>org.apache.camel</groupId>
<artifactId>camel-bundle-plugin</artifactId>
- <version>${camel-bundle-plugin-version}</version>
+ <version>${project.version}</version>
<configuration>
<instructions>
</instructions>
diff --git a/components/pom.xml b/components/pom.xml
index 32c82a3..157b01e 100644
--- a/components/pom.xml
+++ b/components/pom.xml
@@ -429,7 +429,7 @@
<plugin>
<groupId>org.apache.camel</groupId>
<artifactId>camel-bundle-plugin</artifactId>
- <version>${camel-bundle-plugin-version}</version>
+ <version>${project.version}</version>
<extensions>false</extensions>
<configuration>
<supportIncrementalBuild>true</supportIncrementalBuild>
diff --git a/core/camel-caffeine-lrucache/pom.xml b/core/camel-caffeine-lrucache/pom.xml
index e597230..fc198fd 100644
--- a/core/camel-caffeine-lrucache/pom.xml
+++ b/core/camel-caffeine-lrucache/pom.xml
@@ -78,7 +78,7 @@
<plugin>
<groupId>org.apache.camel</groupId>
<artifactId>camel-bundle-plugin</artifactId>
- <version>${camel-bundle-plugin-version}</version>
+ <version>${project.version}</version>
<extensions>false</extensions>
<configuration>
<supportIncrementalBuild>true</supportIncrementalBuild>
diff --git a/core/pom.xml b/core/pom.xml
index 9748d58..0f0d6f3 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -102,7 +102,7 @@
<plugin>
<groupId>org.apache.camel</groupId>
<artifactId>camel-bundle-plugin</artifactId>
- <version>${camel-bundle-plugin-version}</version>
+ <version>${project.version}</version>
<configuration>
<supportIncrementalBuild>true</supportIncrementalBuild>
<noWarningProjectTypes>pom</noWarningProjectTypes>
diff --git a/parent/pom.xml b/parent/pom.xml
index b9469b0..5b1884d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -34,7 +34,6 @@
<properties>
<compiler.fork>true</compiler.fork>
- <camel-bundle-plugin-version>${project.version}</camel-bundle-plugin-version>
<cxf.codegenplugin.forkmode>once</cxf.codegenplugin.forkmode>
<cxf.codegen.jvmArgs/>
<camel.surefire.fork.vmargs/>
diff --git a/platforms/commands/commands-core/pom.xml b/platforms/commands/commands-core/pom.xml
index db8eb30..7db750e 100644
--- a/platforms/commands/commands-core/pom.xml
+++ b/platforms/commands/commands-core/pom.xml
@@ -85,7 +85,7 @@
<plugin>
<groupId>org.apache.camel</groupId>
<artifactId>camel-bundle-plugin</artifactId>
- <version>${camel-bundle-plugin-version}</version>
+ <version>${project.version}</version>
<configuration>
<instructions>
<Private-Package>
diff --git a/tests/pom.xml b/tests/pom.xml
index d3c49a0..9e24455 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -55,7 +55,7 @@
<plugin>
<groupId>org.apache.camel</groupId>
<artifactId>camel-bundle-plugin</artifactId>
- <version>${camel-bundle-plugin-version}</version>
+ <version>${project.version}</version>
<configuration>
</configuration>
<executions>
diff --git a/tests/test-bundles/pom.xml b/tests/test-bundles/pom.xml
index c0cda00..62bf6acf 100644
--- a/tests/test-bundles/pom.xml
+++ b/tests/test-bundles/pom.xml
@@ -89,7 +89,7 @@
<plugin>
<groupId>org.apache.camel</groupId>
<artifactId>camel-bundle-plugin</artifactId>
- <version>${camel-bundle-plugin-version}</version>
+ <version>${project.version}</version>
<configuration>
<instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
diff --git a/tooling/camel-tooling-model/pom.xml b/tooling/camel-tooling-model/pom.xml
index 6ab2b85..eeaeadc 100644
--- a/tooling/camel-tooling-model/pom.xml
+++ b/tooling/camel-tooling-model/pom.xml
@@ -77,7 +77,7 @@
<plugin>
<groupId>org.apache.camel</groupId>
<artifactId>camel-bundle-plugin</artifactId>
- <version>${camel-bundle-plugin-version}</version>
+ <version>${project.version}</version>
<configuration>
<supportIncrementalBuild>true</supportIncrementalBuild>
<noWarningProjectTypes>pom</noWarningProjectTypes>
diff --git a/tooling/camel-tooling-util/pom.xml b/tooling/camel-tooling-util/pom.xml
index 0128c53..67c8a07 100644
--- a/tooling/camel-tooling-util/pom.xml
+++ b/tooling/camel-tooling-util/pom.xml
@@ -73,7 +73,7 @@
<plugin>
<groupId>org.apache.camel</groupId>
<artifactId>camel-bundle-plugin</artifactId>
- <version>${camel-bundle-plugin-version}</version>
+ <version>${project.version}</version>
<configuration>
<supportIncrementalBuild>true</supportIncrementalBuild>
<noWarningProjectTypes>pom</noWarningProjectTypes>
diff --git a/tooling/camel-util-json/pom.xml b/tooling/camel-util-json/pom.xml
index 1a55008..540ba55 100644
--- a/tooling/camel-util-json/pom.xml
+++ b/tooling/camel-util-json/pom.xml
@@ -54,7 +54,7 @@
<plugin>
<groupId>org.apache.camel</groupId>
<artifactId>camel-bundle-plugin</artifactId>
- <version>${camel-bundle-plugin-version}</version>
+ <version>${project.version}</version>
<configuration>
<supportIncrementalBuild>true</supportIncrementalBuild>
<noWarningProjectTypes>pom</noWarningProjectTypes>
diff --git a/tooling/openapi-rest-dsl-generator/pom.xml b/tooling/openapi-rest-dsl-generator/pom.xml
index 5bf43e8..5248a61 100644
--- a/tooling/openapi-rest-dsl-generator/pom.xml
+++ b/tooling/openapi-rest-dsl-generator/pom.xml
@@ -97,7 +97,7 @@
<plugin>
<groupId>org.apache.camel</groupId>
<artifactId>camel-bundle-plugin</artifactId>
- <version>${camel-bundle-plugin-version}</version>
+ <version>${project.version}</version>
<configuration>
<supportIncrementalBuild>true</supportIncrementalBuild>
<noWarningProjectTypes>pom</noWarningProjectTypes>
diff --git a/tooling/spi-annotations/pom.xml b/tooling/spi-annotations/pom.xml
index eb3a399..668fe72 100644
--- a/tooling/spi-annotations/pom.xml
+++ b/tooling/spi-annotations/pom.xml
@@ -50,7 +50,7 @@
<plugin>
<groupId>org.apache.camel</groupId>
<artifactId>camel-bundle-plugin</artifactId>
- <version>${camel-bundle-plugin-version}</version>
+ <version>${project.version}</version>
<configuration>
<supportIncrementalBuild>true</supportIncrementalBuild>
<noWarningProjectTypes>pom</noWarningProjectTypes>
diff --git a/tooling/swagger-rest-dsl-generator/pom.xml b/tooling/swagger-rest-dsl-generator/pom.xml
index f80c561..453449c 100644
--- a/tooling/swagger-rest-dsl-generator/pom.xml
+++ b/tooling/swagger-rest-dsl-generator/pom.xml
@@ -91,7 +91,7 @@
<plugin>
<groupId>org.apache.camel</groupId>
<artifactId>camel-bundle-plugin</artifactId>
- <version>${camel-bundle-plugin-version}</version>
+ <version>${project.version}</version>
<configuration>
<supportIncrementalBuild>true</supportIncrementalBuild>
<noWarningProjectTypes>pom</noWarningProjectTypes>