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 2022/01/21 13:29:14 UTC
[camel-karaf] branch main updated (352fe69 -> e47a674)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git.
from 352fe69 CAMEL-17499: Renaming inconsistent data format names in model
new 440fc55 Don't use the Hibernate Validator feature repository
new ec50ff8 Externalize Classmate version property placeholder
new 3d27d92 Externalize Classmate version property placeholder
new 022d13a Externalize Jboss Logging version property placeholder
new e66f525 Externalize Jboss Logging version property placeholder
new c7cc752 Externalize Jakarta Validation API and EL version property placeholders
new 53ea5e7 Externalize Jakarta Validation API and EL version property placeholders
new 9746544 Use Hibernate Validator version coming from Camel-dependencies
new e47a674 Fix property placeholder name
The 9 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
platforms/karaf/features/src/main/resources/features.xml | 13 ++++++++++---
pom.xml | 4 ++++
2 files changed, 14 insertions(+), 3 deletions(-)
[camel-karaf] 06/09: Externalize Jakarta Validation API and EL version property placeholders
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
commit c7cc752a5830b1671f46c48e036ea526574f2fa5
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Jan 21 14:16:53 2022 +0100
Externalize Jakarta Validation API and EL version property placeholders
---
pom.xml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/pom.xml b/pom.xml
index 0948d63..a285703 100644
--- a/pom.xml
+++ b/pom.xml
@@ -198,6 +198,8 @@
<ironmq-bundle-version>3.0.5_1</ironmq-bundle-version>
<isorelax-bundle-version>20050913_4</isorelax-bundle-version>
<ivy-version>2.4.0</ivy-version>
+ <jakarta-el-version>3.0.3</jakarta-el-version>
+ <jakarat-validation-api-version>2.0.1</jakarta-validation-api-version>
<jandex-version>2.1.2.Final</jandex-version>
<jasypt-bundle-version>1.9.3_1</jasypt-bundle-version>
<java-ewah-version>1.1.6</java-ewah-version>
[camel-karaf] 07/09: Externalize Jakarta Validation API and EL version property placeholders
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
commit 53ea5e71584b708503163326f6a823f3a80440f0
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Jan 21 14:18:16 2022 +0100
Externalize Jakarta Validation API and EL version property placeholders
---
platforms/karaf/features/src/main/resources/features.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index 1c43022..5299e93 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -442,10 +442,10 @@
<feature name='camel-bean-validator' version='${project.version}' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
<bundle>mvn:org.hibernate.validator/hibernate-validator/6.2.0.Final</bundle>
- <bundle>mvn:jakarta.validation/jakarta.validation-api/2.0.2</bundle>
+ <bundle>mvn:jakarta.validation/jakarta.validation-api/${jakarta-validation-api-version}</bundle>
<bundle>mvn:org.jboss.logging/jboss-logging/${jboss-logging-version}</bundle>
<bundle>mvn:com.fasterxml/classmate/${classmate-version}</bundle>
- <bundle>mvn:org.glassfish/jakarta.el/3.0.3</bundle>
+ <bundle>mvn:org.glassfish/jakarta.el/${jakarta-el-version}</bundle>
<bundle>mvn:org.apache.camel.karaf/camel-bean-validator-osgi/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-bean-validator/${project.version}</bundle>
</feature>
@@ -539,10 +539,10 @@
<feature version='${project.version}'>camel-core</feature>
<feature version='${cxf-version-range}'>cxf-specs</feature>
<bundle>mvn:org.hibernate.validator/hibernate-validator/6.2.0.Final</bundle>
- <bundle>mvn:jakarta.validation/jakarta.validation-api/2.0.2</bundle>
+ <bundle>mvn:jakarta.validation/jakarta.validation-api/${jakarta-validation-api-version}</bundle>
<bundle>mvn:org.jboss.logging/jboss-logging/${jboss-logging-version}</bundle>
<bundle>mvn:com.fasterxml/classmate/${classmate-version}</bundle>
- <bundle>mvn:org.glassfish/jakarta.el/3.0.3</bundle>
+ <bundle>mvn:org.glassfish/jakarta.el/${jakarta-el-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.libphonenumber/${libphonenumber-bundle-version}</bundle>
<bundle dependency='true'>mvn:org.apache.httpcomponents/httpcore-osgi/${httpcore4-version}</bundle>
<bundle dependency='true'>mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient4-version}</bundle>
[camel-karaf] 05/09: Externalize Jboss Logging version property placeholder
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
commit e66f525659c5a069a866066feaac6dab29a2d8fc
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Jan 21 14:15:45 2022 +0100
Externalize Jboss Logging version property placeholder
---
platforms/karaf/features/src/main/resources/features.xml | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index 9ffa56b..1c43022 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -443,7 +443,7 @@
<feature version='${project.version}'>camel-core</feature>
<bundle>mvn:org.hibernate.validator/hibernate-validator/6.2.0.Final</bundle>
<bundle>mvn:jakarta.validation/jakarta.validation-api/2.0.2</bundle>
- <bundle>mvn:org.jboss.logging/jboss-logging/3.4.1.Final</bundle>
+ <bundle>mvn:org.jboss.logging/jboss-logging/${jboss-logging-version}</bundle>
<bundle>mvn:com.fasterxml/classmate/${classmate-version}</bundle>
<bundle>mvn:org.glassfish/jakarta.el/3.0.3</bundle>
<bundle>mvn:org.apache.camel.karaf/camel-bean-validator-osgi/${project.version}</bundle>
@@ -538,11 +538,11 @@
<feature name='camel-cm-sms' version='${project.version}' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
<feature version='${cxf-version-range}'>cxf-specs</feature>
-<bundle>mvn:org.hibernate.validator/hibernate-validator/6.2.0.Final</bundle>
-<bundle>mvn:jakarta.validation/jakarta.validation-api/2.0.2</bundle>
-<bundle>mvn:org.jboss.logging/jboss-logging/3.4.1.Final</bundle>
-<bundle>mvn:com.fasterxml/classmate/1.5.1</bundle>
-<bundle>mvn:org.glassfish/jakarta.el/3.0.3</bundle>
+ <bundle>mvn:org.hibernate.validator/hibernate-validator/6.2.0.Final</bundle>
+ <bundle>mvn:jakarta.validation/jakarta.validation-api/2.0.2</bundle>
+ <bundle>mvn:org.jboss.logging/jboss-logging/${jboss-logging-version}</bundle>
+ <bundle>mvn:com.fasterxml/classmate/${classmate-version}</bundle>
+ <bundle>mvn:org.glassfish/jakarta.el/3.0.3</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.libphonenumber/${libphonenumber-bundle-version}</bundle>
<bundle dependency='true'>mvn:org.apache.httpcomponents/httpcore-osgi/${httpcore4-version}</bundle>
<bundle dependency='true'>mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient4-version}</bundle>
[camel-karaf] 02/09: Externalize Classmate version property placeholder
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
commit ec50ff895a0046be76762100613901c38bb2510c
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Jan 21 14:12:47 2022 +0100
Externalize Classmate version property placeholder
---
pom.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/pom.xml b/pom.xml
index a330400..f03dec7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -144,6 +144,7 @@
<build-helper-maven-plugin-version>1.12</build-helper-maven-plugin-version>
<c3p0-bundle-version>0.9.5.5_1</c3p0-bundle-version>
<chunk-templates-bundle-version>3.6.1_1</chunk-templates-bundle-version>
+ <classmate-version>1.5.1</classmate-version>
<cometd-java-server-bundle-version>2.3.1_2</cometd-java-server-bundle-version>
<commons-httpclient-bundle-version>3.1_7</commons-httpclient-bundle-version>
<consul-client-bundle-version>1.3.3_1</consul-client-bundle-version>
[camel-karaf] 03/09: Externalize Classmate version property placeholder
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
commit 3d27d9283ccfa8aa38bacccaa8b750dac62ef934
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Jan 21 14:13:24 2022 +0100
Externalize Classmate version property placeholder
---
platforms/karaf/features/src/main/resources/features.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index d07d37b..9ffa56b 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -444,7 +444,7 @@
<bundle>mvn:org.hibernate.validator/hibernate-validator/6.2.0.Final</bundle>
<bundle>mvn:jakarta.validation/jakarta.validation-api/2.0.2</bundle>
<bundle>mvn:org.jboss.logging/jboss-logging/3.4.1.Final</bundle>
- <bundle>mvn:com.fasterxml/classmate/1.5.1</bundle>
+ <bundle>mvn:com.fasterxml/classmate/${classmate-version}</bundle>
<bundle>mvn:org.glassfish/jakarta.el/3.0.3</bundle>
<bundle>mvn:org.apache.camel.karaf/camel-bean-validator-osgi/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-bean-validator/${project.version}</bundle>
[camel-karaf] 04/09: Externalize Jboss Logging version property placeholder
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
commit 022d13a0803f77c056dcc70dc7f03b739a462264
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Jan 21 14:14:18 2022 +0100
Externalize Jboss Logging version property placeholder
---
pom.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/pom.xml b/pom.xml
index f03dec7..0948d63 100644
--- a/pom.xml
+++ b/pom.xml
@@ -205,6 +205,7 @@
<javax-inject-bundle-version>1_2</javax-inject-bundle-version>
<jaxb-version>2.3.0</jaxb-version>
<jaxb-bundle-version>2.3.1_1</jaxb-bundle-version>
+ <jboss-logging-version>3.4.1.Final</jboss-logging-version>
<jdom-bundle-version>2.0.6_1</jdom-bundle-version>
<jetty9-version>9.4.32.v20200930</jetty9-version>
<jing-bundle-version>20030619_5</jing-bundle-version>
[camel-karaf] 08/09: Use Hibernate Validator version coming from Camel-dependencies
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
commit 9746544fc27dd7db1ad053d8cc94607991336d72
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Jan 21 14:19:17 2022 +0100
Use Hibernate Validator version coming from Camel-dependencies
---
platforms/karaf/features/src/main/resources/features.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index 5299e93..7a8f172 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -441,7 +441,7 @@
</feature>
<feature name='camel-bean-validator' version='${project.version}' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
- <bundle>mvn:org.hibernate.validator/hibernate-validator/6.2.0.Final</bundle>
+ <bundle>mvn:org.hibernate.validator/hibernate-validator/${hibernate-validator-version}</bundle>
<bundle>mvn:jakarta.validation/jakarta.validation-api/${jakarta-validation-api-version}</bundle>
<bundle>mvn:org.jboss.logging/jboss-logging/${jboss-logging-version}</bundle>
<bundle>mvn:com.fasterxml/classmate/${classmate-version}</bundle>
@@ -538,7 +538,7 @@
<feature name='camel-cm-sms' version='${project.version}' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
<feature version='${cxf-version-range}'>cxf-specs</feature>
- <bundle>mvn:org.hibernate.validator/hibernate-validator/6.2.0.Final</bundle>
+ <bundle>mvn:org.hibernate.validator/hibernate-validator/${hibernate-validator-version}</bundle>
<bundle>mvn:jakarta.validation/jakarta.validation-api/${jakarta-validation-api-version}</bundle>
<bundle>mvn:org.jboss.logging/jboss-logging/${jboss-logging-version}</bundle>
<bundle>mvn:com.fasterxml/classmate/${classmate-version}</bundle>
[camel-karaf] 09/09: Fix property placeholder name
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
commit e47a674a1d02ce5a5d38ed25375443bc17ae5c90
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Jan 21 14:20:21 2022 +0100
Fix property placeholder name
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index a285703..aa3d35e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -199,7 +199,7 @@
<isorelax-bundle-version>20050913_4</isorelax-bundle-version>
<ivy-version>2.4.0</ivy-version>
<jakarta-el-version>3.0.3</jakarta-el-version>
- <jakarat-validation-api-version>2.0.1</jakarta-validation-api-version>
+ <jakarta-validation-api-version>2.0.1</jakarta-validation-api-version>
<jandex-version>2.1.2.Final</jandex-version>
<jasypt-bundle-version>1.9.3_1</jasypt-bundle-version>
<java-ewah-version>1.1.6</java-ewah-version>
[camel-karaf] 01/09: Don't use the Hibernate Validator feature repository
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
commit 440fc55b122dbf5898a0e0070aaed7d07f5e5cd7
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Jan 21 14:11:11 2022 +0100
Don't use the Hibernate Validator feature repository
---
platforms/karaf/features/src/main/resources/features.xml | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index 527ca5b..d07d37b 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -20,7 +20,6 @@
<features xmlns="http://karaf.apache.org/xmlns/features/v1.5.0" name='camel-${project.version}'>
<repository>mvn:org.apache.cxf.karaf/apache-cxf/${cxf-version-range}/xml/features</repository>
<repository>mvn:org.ops4j.pax.cdi/pax-cdi-features/[1,2)/xml/features</repository>
- <repository>mvn:org.hibernate.validator/hibernate-validator-osgi-karaf-features/[6.2,6.2]/xml/features</repository>
<feature name='xml-specs-api' version='${servicemix-specs-version}' start-level='10'>
<bundle dependency='true'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${servicemix-specs-version}</bundle>
@@ -442,7 +441,11 @@
</feature>
<feature name='camel-bean-validator' version='${project.version}' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
- <feature>hibernate-validator</feature>
+ <bundle>mvn:org.hibernate.validator/hibernate-validator/6.2.0.Final</bundle>
+ <bundle>mvn:jakarta.validation/jakarta.validation-api/2.0.2</bundle>
+ <bundle>mvn:org.jboss.logging/jboss-logging/3.4.1.Final</bundle>
+ <bundle>mvn:com.fasterxml/classmate/1.5.1</bundle>
+ <bundle>mvn:org.glassfish/jakarta.el/3.0.3</bundle>
<bundle>mvn:org.apache.camel.karaf/camel-bean-validator-osgi/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-bean-validator/${project.version}</bundle>
</feature>
@@ -535,7 +538,11 @@
<feature name='camel-cm-sms' version='${project.version}' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
<feature version='${cxf-version-range}'>cxf-specs</feature>
- <feature>hibernate-validator</feature>
+<bundle>mvn:org.hibernate.validator/hibernate-validator/6.2.0.Final</bundle>
+<bundle>mvn:jakarta.validation/jakarta.validation-api/2.0.2</bundle>
+<bundle>mvn:org.jboss.logging/jboss-logging/3.4.1.Final</bundle>
+<bundle>mvn:com.fasterxml/classmate/1.5.1</bundle>
+<bundle>mvn:org.glassfish/jakarta.el/3.0.3</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.libphonenumber/${libphonenumber-bundle-version}</bundle>
<bundle dependency='true'>mvn:org.apache.httpcomponents/httpcore-osgi/${httpcore4-version}</bundle>
<bundle dependency='true'>mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient4-version}</bundle>