You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by nf...@apache.org on 2022/10/14 12:06:41 UTC
[camel] branch main updated: CAMEL-18611: camel-main - Move the configurers in the main package (#8551)
This is an automated email from the ASF dual-hosted git repository.
nfilotto pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 10df1ef15e6 CAMEL-18611: camel-main - Move the configurers in the main package (#8551)
10df1ef15e6 is described below
commit 10df1ef15e6343f742cdbac850b08769d038dd64
Author: Nicolas Filotto <es...@users.noreply.github.com>
AuthorDate: Fri Oct 14 14:06:35 2022 +0200
CAMEL-18611: camel-main - Move the configurers in the main package (#8551)
## Motivation
The feature `camel-blueprint` is no more usable due to a split packages issue, indeed the package `org.apache.camel.vault` can be found in `camel-api` as expected but also in `camel-main`. Unfortunately, Karaf affects `camel-main` to the package `org.apache.camel.vault` such that we end up with a `ClassNotFoundException` when it tries to find the class `org.apache.camel.vault.VaultConfiguration`.
## Modifications
* Move the configurers in the main package
---
core/camel-main/pom.xml | 11 ++++++++++-
.../{vault => main}/AwsVaultConfigurationConfigurer.java | 2 +-
.../{vault => main}/AzureVaultConfigurationConfigurer.java | 2 +-
.../{vault => main}/GcpVaultConfigurationConfigurer.java | 2 +-
.../HashicorpVaultConfigurationConfigurer.java | 2 +-
.../configurer/org.apache.camel.vault.AwsVaultConfiguration | 2 +-
.../configurer/org.apache.camel.vault.AzureVaultConfiguration | 2 +-
.../configurer/org.apache.camel.vault.GcpVaultConfiguration | 2 +-
.../org.apache.camel.vault.HashicorpVaultConfiguration | 2 +-
9 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/core/camel-main/pom.xml b/core/camel-main/pom.xml
index ad34a7f687a..c61fa865ab2 100644
--- a/core/camel-main/pom.xml
+++ b/core/camel-main/pom.xml
@@ -151,7 +151,16 @@
<goal>generate-configurer</goal>
</goals>
<configuration>
- <classes>org.apache.camel.vault.AwsVaultConfiguration,org.apache.camel.vault.AzureVaultConfiguration,org.apache.camel.vault.GcpVaultConfiguration,org.apache.camel.vault.HashicorpVaultConfiguration</classes>
+ <classes>
+ <!-- we want to have configurer for AwsVaultConfiguration in the package main to prevent a split packages issue -->
+ <class>org.apache.camel.vault.AwsVaultConfiguration=org.apache.camel.main.AwsVaultConfiguration</class>
+ <!-- we want to have configurer for AzureVaultConfiguration in the package main to prevent a split packages issue -->
+ <class>org.apache.camel.vault.AzureVaultConfiguration=org.apache.camel.main.AzureVaultConfiguration</class>
+ <!-- we want to have configurer for GcpVaultConfiguration in the package main to prevent a split packages issue -->
+ <class>org.apache.camel.vault.GcpVaultConfiguration=org.apache.camel.main.GcpVaultConfiguration</class>
+ <!-- we want to have configurer for HashicorpVaultConfiguration in the package main to prevent a split packages issue -->
+ <class>org.apache.camel.vault.HashicorpVaultConfiguration=org.apache.camel.main.HashicorpVaultConfiguration</class>
+ </classes>
</configuration>
</execution>
<execution>
diff --git a/core/camel-main/src/generated/java/org/apache/camel/vault/AwsVaultConfigurationConfigurer.java b/core/camel-main/src/generated/java/org/apache/camel/main/AwsVaultConfigurationConfigurer.java
similarity index 99%
rename from core/camel-main/src/generated/java/org/apache/camel/vault/AwsVaultConfigurationConfigurer.java
rename to core/camel-main/src/generated/java/org/apache/camel/main/AwsVaultConfigurationConfigurer.java
index e8e9fb22325..e9bba9ad2dd 100644
--- a/core/camel-main/src/generated/java/org/apache/camel/vault/AwsVaultConfigurationConfigurer.java
+++ b/core/camel-main/src/generated/java/org/apache/camel/main/AwsVaultConfigurationConfigurer.java
@@ -1,5 +1,5 @@
/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.vault;
+package org.apache.camel.main;
import java.util.Map;
diff --git a/core/camel-main/src/generated/java/org/apache/camel/vault/AzureVaultConfigurationConfigurer.java b/core/camel-main/src/generated/java/org/apache/camel/main/AzureVaultConfigurationConfigurer.java
similarity index 99%
rename from core/camel-main/src/generated/java/org/apache/camel/vault/AzureVaultConfigurationConfigurer.java
rename to core/camel-main/src/generated/java/org/apache/camel/main/AzureVaultConfigurationConfigurer.java
index de815ca031d..9560719e584 100644
--- a/core/camel-main/src/generated/java/org/apache/camel/vault/AzureVaultConfigurationConfigurer.java
+++ b/core/camel-main/src/generated/java/org/apache/camel/main/AzureVaultConfigurationConfigurer.java
@@ -1,5 +1,5 @@
/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.vault;
+package org.apache.camel.main;
import java.util.Map;
diff --git a/core/camel-main/src/generated/java/org/apache/camel/vault/GcpVaultConfigurationConfigurer.java b/core/camel-main/src/generated/java/org/apache/camel/main/GcpVaultConfigurationConfigurer.java
similarity index 99%
rename from core/camel-main/src/generated/java/org/apache/camel/vault/GcpVaultConfigurationConfigurer.java
rename to core/camel-main/src/generated/java/org/apache/camel/main/GcpVaultConfigurationConfigurer.java
index e7e11775ec1..e1dc8dbffe3 100644
--- a/core/camel-main/src/generated/java/org/apache/camel/vault/GcpVaultConfigurationConfigurer.java
+++ b/core/camel-main/src/generated/java/org/apache/camel/main/GcpVaultConfigurationConfigurer.java
@@ -1,5 +1,5 @@
/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.vault;
+package org.apache.camel.main;
import java.util.Map;
diff --git a/core/camel-main/src/generated/java/org/apache/camel/vault/HashicorpVaultConfigurationConfigurer.java b/core/camel-main/src/generated/java/org/apache/camel/main/HashicorpVaultConfigurationConfigurer.java
similarity index 99%
rename from core/camel-main/src/generated/java/org/apache/camel/vault/HashicorpVaultConfigurationConfigurer.java
rename to core/camel-main/src/generated/java/org/apache/camel/main/HashicorpVaultConfigurationConfigurer.java
index 9931b3683a3..72cf78d2605 100644
--- a/core/camel-main/src/generated/java/org/apache/camel/vault/HashicorpVaultConfigurationConfigurer.java
+++ b/core/camel-main/src/generated/java/org/apache/camel/main/HashicorpVaultConfigurationConfigurer.java
@@ -1,5 +1,5 @@
/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.vault;
+package org.apache.camel.main;
import java.util.Map;
diff --git a/core/camel-main/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.vault.AwsVaultConfiguration b/core/camel-main/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.vault.AwsVaultConfiguration
index 7a503509765..91f1f3e5da8 100644
--- a/core/camel-main/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.vault.AwsVaultConfiguration
+++ b/core/camel-main/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.vault.AwsVaultConfiguration
@@ -1,2 +1,2 @@
# Generated by camel build tools - do NOT edit this file!
-class=org.apache.camel.vault.AwsVaultConfigurationConfigurer
+class=org.apache.camel.main.AwsVaultConfigurationConfigurer
diff --git a/core/camel-main/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.vault.AzureVaultConfiguration b/core/camel-main/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.vault.AzureVaultConfiguration
index 0cd24e89184..a24e47a3724 100644
--- a/core/camel-main/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.vault.AzureVaultConfiguration
+++ b/core/camel-main/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.vault.AzureVaultConfiguration
@@ -1,2 +1,2 @@
# Generated by camel build tools - do NOT edit this file!
-class=org.apache.camel.vault.AzureVaultConfigurationConfigurer
+class=org.apache.camel.main.AzureVaultConfigurationConfigurer
diff --git a/core/camel-main/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.vault.GcpVaultConfiguration b/core/camel-main/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.vault.GcpVaultConfiguration
index 69619397746..c510db8c6a3 100644
--- a/core/camel-main/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.vault.GcpVaultConfiguration
+++ b/core/camel-main/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.vault.GcpVaultConfiguration
@@ -1,2 +1,2 @@
# Generated by camel build tools - do NOT edit this file!
-class=org.apache.camel.vault.GcpVaultConfigurationConfigurer
+class=org.apache.camel.main.GcpVaultConfigurationConfigurer
diff --git a/core/camel-main/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.vault.HashicorpVaultConfiguration b/core/camel-main/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.vault.HashicorpVaultConfiguration
index d8af04e4df3..0dd6674cfc1 100644
--- a/core/camel-main/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.vault.HashicorpVaultConfiguration
+++ b/core/camel-main/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.vault.HashicorpVaultConfiguration
@@ -1,2 +1,2 @@
# Generated by camel build tools - do NOT edit this file!
-class=org.apache.camel.vault.HashicorpVaultConfigurationConfigurer
+class=org.apache.camel.main.HashicorpVaultConfigurationConfigurer