You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by jb...@apache.org on 2023/05/09 07:32:54 UTC
[servicemix-bundles] branch master updated: [SM-5530] Set spring-expression as optional in spring-jms bundle
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 772c52226 [SM-5530] Set spring-expression as optional in spring-jms bundle
772c52226 is described below
commit 772c522268d708db536a59525ac44feaa53f0775
Author: JB Onofré <jb...@dremio.com>
AuthorDate: Tue May 9 09:32:02 2023 +0200
[SM-5530] Set spring-expression as optional in spring-jms bundle
---
pom.xml | 55 +++++++++++++++++++++++++++++++++++++++
spring-jms-5.1.20.RELEASE/pom.xml | 8 +++---
spring-jms-5.2.23.RELEASE/pom.xml | 8 +++---
spring-jms-5.3.26/pom.xml | 8 +++---
spring-jms-6.0.7/pom.xml | 8 +++---
5 files changed, 71 insertions(+), 16 deletions(-)
diff --git a/pom.xml b/pom.xml
index 2091b6172..5071559c4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -92,6 +92,61 @@
<module>spring-data-commons-3.0.5</module>
<module>spring-data-keyvalue-3.0.5</module>
<module>spring-data-redis-3.0.5</module>
+ <module>spring-aop-5.3.26</module>
+ <module>spring-aspects-5.3.26</module>
+ <module>spring-beans-5.3.26</module>
+ <module>spring-context-5.3.26</module>
+ <module>spring-context-support-5.3.26</module>
+ <module>spring-core-5.3.26</module>
+ <module>spring-expression-5.3.26</module>
+ <module>spring-instrument-5.3.26</module>
+ <module>spring-jdbc-5.3.26</module>
+ <module>spring-jms-5.3.26</module>
+ <module>spring-messaging-5.3.26</module>
+ <module>spring-orm-5.3.26</module>
+ <module>spring-oxm-5.3.26</module>
+ <module>spring-test-5.3.26</module>
+ <module>spring-tx-5.3.26</module>
+ <module>spring-web-5.3.26</module>
+ <module>spring-webflux-5.3.26</module>
+ <module>spring-webmvc-5.3.26</module>
+ <module>spring-websocket-5.3.26</module>
+ <module>spring-aop-5.2.23.RELEASE</module>
+ <module>spring-aspects-5.2.23.RELEASE</module>
+ <module>spring-beans-5.2.23.RELEASE</module>
+ <module>spring-context-5.2.23.RELEASE</module>
+ <module>spring-context-support-5.2.23.RELEASE</module>
+ <module>spring-core-5.2.23.RELEASE</module>
+ <module>spring-expression-5.2.23.RELEASE</module>
+ <module>spring-instrument-5.2.23.RELEASE</module>
+ <module>spring-jdbc-5.2.23.RELEASE</module>
+ <module>spring-jms-5.2.23.RELEASE</module>
+ <module>spring-messaging-5.2.23.RELEASE</module>
+ <module>spring-orm-5.2.23.RELEASE</module>
+ <module>spring-oxm-5.2.23.RELEASE</module>
+ <module>spring-test-5.2.23.RELEASE</module>
+ <module>spring-tx-5.2.23.RELEASE</module>
+ <module>spring-web-5.2.23.RELEASE</module>
+ <module>spring-webmvc-5.2.23.RELEASE</module>
+ <module>spring-websocket-5.2.23.RELEASE</module>
+ <module>spring-aop-5.1.20.RELEASE</module>
+ <module>spring-aspects-5.1.20.RELEASE</module>
+ <module>spring-beans-5.1.20.RELEASE</module>
+ <module>spring-context-5.1.20.RELEASE</module>
+ <module>spring-context-support-5.1.20.RELEASE</module>
+ <module>spring-core-5.1.20.RELEASE</module>
+ <module>spring-expression-5.1.20.RELEASE</module>
+ <module>spring-instrument-5.1.20.RELEASE</module>
+ <module>spring-jdbc-5.1.20.RELEASE</module>
+ <module>spring-jms-5.1.20.RELEASE</module>
+ <module>spring-messaging-5.1.20.RELEASE</module>
+ <module>spring-orm-5.1.20.RELEASE</module>
+ <module>spring-oxm-5.1.20.RELEASE</module>
+ <module>spring-test-5.1.20.RELEASE</module>
+ <module>spring-tx-5.1.20.RELEASE</module>
+ <module>spring-web-5.1.20.RELEASE</module>
+ <module>spring-webmvc-5.1.20.RELEASE</module>
+ <module>spring-websocket-5.1.20.RELEASE</module>
</modules>
</project>
diff --git a/spring-jms-5.1.20.RELEASE/pom.xml b/spring-jms-5.1.20.RELEASE/pom.xml
index 742bf0d40..70962d160 100644
--- a/spring-jms-5.1.20.RELEASE/pom.xml
+++ b/spring-jms-5.1.20.RELEASE/pom.xml
@@ -85,10 +85,10 @@
org.springframework.core.convert;version="[${pkgVersion},5.2)",
org.springframework.core.convert.support;version="[${pkgVersion},5.2)",
org.springframework.core.task;version="[${pkgVersion},5.2)",
- org.springframework.expression;version="[${pkgVersion},5.2)",
- org.springframework.expression.spel;version="[${pkgVersion},5.2)",
- org.springframework.expression.spel.standard;version="[${pkgVersion},5.2)",
- org.springframework.expression.spel.support;version="[${pkgVersion},5.2)",
+ org.springframework.expression;version="[${pkgVersion},5.2)";resolution:=optional,
+ org.springframework.expression.spel;version="[${pkgVersion},5.2)";resolution:=optional,
+ org.springframework.expression.spel.standard;version="[${pkgVersion},5.2)";resolution:=optional,
+ org.springframework.expression.spel.support;version="[${pkgVersion},5.2)";resolution:=optional,
org.springframework.format.support;version="[${pkgVersion},5.2)";resolution:=optional,
org.springframework.jca.endpoint;version="[${pkgVersion},5.2)";resolution:=optional,
org.springframework.jndi;version="[${pkgVersion},5.2)";resolution:=optional,
diff --git a/spring-jms-5.2.23.RELEASE/pom.xml b/spring-jms-5.2.23.RELEASE/pom.xml
index 6a11149dd..999391685 100644
--- a/spring-jms-5.2.23.RELEASE/pom.xml
+++ b/spring-jms-5.2.23.RELEASE/pom.xml
@@ -86,10 +86,10 @@
org.springframework.core.convert;version="[${pkgVersion},5.3)",
org.springframework.core.convert.support;version="[${pkgVersion},5.3)",
org.springframework.core.task;version="[${pkgVersion},5.3)",
- org.springframework.expression;version="[${pkgVersion},5.3)",
- org.springframework.expression.spel;version="[${pkgVersion},5.3)",
- org.springframework.expression.spel.standard;version="[${pkgVersion},5.3)",
- org.springframework.expression.spel.support;version="[${pkgVersion},5.3)",
+ org.springframework.expression;version="[${pkgVersion},5.3)";resolution:=optional,
+ org.springframework.expression.spel;version="[${pkgVersion},5.3)";resolution:=optional,
+ org.springframework.expression.spel.standard;version="[${pkgVersion},5.3)";resolution:=optional,
+ org.springframework.expression.spel.support;version="[${pkgVersion},5.3)";resolution:=optional,
org.springframework.format.support;version="[${pkgVersion},5.3)";resolution:=optional,
org.springframework.jca.endpoint;version="[${pkgVersion},5.3)";resolution:=optional,
org.springframework.jndi;version="[${pkgVersion},5.3)";resolution:=optional,
diff --git a/spring-jms-5.3.26/pom.xml b/spring-jms-5.3.26/pom.xml
index 281e9aca8..03767193d 100644
--- a/spring-jms-5.3.26/pom.xml
+++ b/spring-jms-5.3.26/pom.xml
@@ -87,10 +87,10 @@
org.springframework.core.convert.support;version="[${pkgVersion},5.4)",
org.springframework.core.log;version="[${pkgVersion},5.4)",
org.springframework.core.task;version="[${pkgVersion},5.4)",
- org.springframework.expression;version="[${pkgVersion},5.4)",
- org.springframework.expression.spel;version="[${pkgVersion},5.4)",
- org.springframework.expression.spel.standard;version="[${pkgVersion},5.4)",
- org.springframework.expression.spel.support;version="[${pkgVersion},5.4)",
+ org.springframework.expression;version="[${pkgVersion},5.4)";resolution:=optional,
+ org.springframework.expression.spel;version="[${pkgVersion},5.4)";resolution:=optional,
+ org.springframework.expression.spel.standard;version="[${pkgVersion},5.4)";resolution:=optional,
+ org.springframework.expression.spel.support;version="[${pkgVersion},5.4)";resolution:=optional,
org.springframework.format.support;version="[${pkgVersion},5.4)";resolution:=optional,
org.springframework.jca.endpoint;version="[${pkgVersion},5.4)";resolution:=optional,
org.springframework.jndi;version="[${pkgVersion},5.4)";resolution:=optional,
diff --git a/spring-jms-6.0.7/pom.xml b/spring-jms-6.0.7/pom.xml
index 2441ed149..d42c6fcf6 100644
--- a/spring-jms-6.0.7/pom.xml
+++ b/spring-jms-6.0.7/pom.xml
@@ -87,10 +87,10 @@
org.springframework.core.convert.support;version="[${pkgVersion},6.1)",
org.springframework.core.log;version="[${pkgVersion},6.1)",
org.springframework.core.task;version="[${pkgVersion},6.1)",
- org.springframework.expression;version="[${pkgVersion},6.1)",
- org.springframework.expression.spel;version="[${pkgVersion},6.1)",
- org.springframework.expression.spel.standard;version="[${pkgVersion},6.1)",
- org.springframework.expression.spel.support;version="[${pkgVersion},6.1)",
+ org.springframework.expression;version="[${pkgVersion},6.1)";resolution:=optional,
+ org.springframework.expression.spel;version="[${pkgVersion},6.1)";resolution:=optional,
+ org.springframework.expression.spel.standard;version="[${pkgVersion},6.1)";resolution:=optional,
+ org.springframework.expression.spel.support;version="[${pkgVersion},6.1)";resolution:=optional,
org.springframework.format.support;version="[${pkgVersion},6.1)";resolution:=optional,
org.springframework.jca.endpoint;version="[${pkgVersion},6.1)";resolution:=optional,
org.springframework.jndi;version="[${pkgVersion},6.1)";resolution:=optional,