This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicemix-bundles.git
The following commit(s) were added to refs/heads/master by this push:
new 4fff3eff4 SM-5780: fix avro bundles
4fff3eff4 is described below
commit 4fff3eff44e165a70a1c67fdfb1cf1ffb233bb76
Author: JB Onofré <[email protected]>
AuthorDate: Wed Apr 30 13:54:11 2025 +0200
SM-5780: fix avro bundles
---
avro-1.11.4/pom.xml | 4 ++--
avro-1.12.0/pom.xml | 2 +-
pom.xml | 4 ++++
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/avro-1.11.4/pom.xml b/avro-1.11.4/pom.xml
index 11cb6aec7..2102abd4e 100644
--- a/avro-1.11.4/pom.xml
+++ b/avro-1.11.4/pom.xml
@@ -53,9 +53,9 @@
</servicemix.osgi.export>
<servicemix.osgi.import.pkg>
javax.annotation,
- com.thoughtworks.paranamer;version="[2.3,3)",
+ com.thoughtworks.paranamer;version="[2.3,3)";resolution:=optional,
org.apache.commons.compress*,
- org.codehaus.jackson*;version="[2,3)",
+ com.fasterxml.jackson*;version="[2,3)",
org.slf4j;resolution:=optional,
org.joda.time;resolution:=optional,
org.xerial.snappy;version="[1.0,2)";resolution:=optional,
diff --git a/avro-1.12.0/pom.xml b/avro-1.12.0/pom.xml
index 43eb31997..292752e04 100644
--- a/avro-1.12.0/pom.xml
+++ b/avro-1.12.0/pom.xml
@@ -53,7 +53,7 @@
</servicemix.osgi.export>
<servicemix.osgi.import.pkg>
javax.annotation,
- com.thoughtworks.paranamer;version="[2.3,3)",
+ com.thoughtworks.paranamer;version="[2.3,3)";resolution:=optional,
org.apache.commons.compress*,
org.codehaus.jackson*;version="[2,3)",
org.slf4j;resolution:=optional,
diff --git a/pom.xml b/pom.xml
index 2e73d6f15..6fb986b29 100644
--- a/pom.xml
+++ b/pom.xml
@@ -116,6 +116,10 @@
<module>spring-security-taglibs-5.7.12</module>
<module>spring-security-test-5.7.12</module>
<module>spring-security-web-5.7.12</module>
+ <module>avro-1.11.4</module>
+ <module>avro-ipc-1.11.4</module>
+ <module>avro-1.12.0</module>
+ <module>avro-ipc-1.12.0</module>
</modules>
</project>
