You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ff...@apache.org on 2021/10/08 16:43:38 UTC

[servicemix-bundles] branch master updated: [SM-4916]more packages in spring-webflux bundles should be optional

This is an automated email from the ASF dual-hosted git repository.

ffang 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 01e429c  [SM-4916]more packages in spring-webflux bundles should be optional
01e429c is described below

commit 01e429c2a16b83a186f2868f855c3aa38fc48b50
Author: Freeman Fang <fr...@gmail.com>
AuthorDate: Fri Oct 8 12:43:24 2021 -0400

    [SM-4916]more packages in spring-webflux bundles should be optional
---
 pom.xml                       | 52 -------------------------------------------
 spring-webflux-5.3.10/pom.xml | 18 +++++++--------
 2 files changed, 9 insertions(+), 61 deletions(-)

diff --git a/pom.xml b/pom.xml
index 778bdff..02d845e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,59 +41,7 @@
     <name>Apache ServiceMix :: Bundles</name>
 
     <modules>
-	<module>spring-aop-5.3.10</module>
-	<module>spring-aspects-5.3.10</module>
-	<module>spring-beans-5.3.10</module>
-	<module>spring-context-5.3.10</module>
-	<module>spring-context-support-5.3.10</module>
-	<module>spring-core-5.3.10</module>
-	<module>spring-expression-5.3.10</module>
-	<module>spring-instrument-5.3.10</module>
-	<module>spring-jdbc-5.3.10</module>
-	<module>spring-jms-5.3.10</module>
-	<module>spring-messaging-5.3.10</module>
-	<module>spring-orm-5.3.10</module>
-	<module>spring-oxm-5.3.10</module>
-	<module>spring-test-5.3.10</module>
-	<module>spring-tx-5.3.10</module>
-	<module>spring-web-5.3.10</module>
 	<module>spring-webflux-5.3.10</module>
-	<module>spring-webmvc-5.3.10</module>
-	<module>spring-websocket-5.3.10</module>
-	<module>txw2-2.3.3</module>
-	<module>xmlbeans-5.0.1</module>
-	<module>dnsjava-3.4.2</module>
-	<module>jt400-10.7</module>
-	<module>bazaarvoice-jolt-0.1.5</module>
-	<module>janusgraph-core-0.6.0</module>
-	<module>docker-java-3.2.12</module>
-	<module>grpc-1.41.0</module>
-	<module>jedis-3.7.0</module>
-  <module>libphonenumber-8.12.33</module>
-  <module>libthrift-0.15.0</module>
-  <module>postgresql-42.2.24.jre7</module>
-  <module>influxdb-java-2.22</module>
-  <module>pulsar-client-2.8.1</module>
-  <module>pulsar-client-admin-2.8.1</module>
-  <module>saxon-10.6</module>
-  <module>jruby-9.3.0.0</module>
-        <module>javax-el-impl-4.0.2</module>
-	<module>any23-2.5</module>
-	<module>htmlunit-2.53.0</module>
-	<module>aws-java-sdk-2.17.46</module>
-	<module>spring-integration-core-5.5.4</module>
-	<module>aws-java-sdk-1.12.74</module>
-	<module>kafka_2.12-3.0.0</module>
-	<module>kafka_2.13-3.0.0</module>
-	<module>kafka-clients-3.0.0</module>
-	<module>kafka-streams-3.0.0</module>
-	<module>spring-data-commons-2.5.5</module>
-	<module>spring-data-keyvalue-2.5.5</module>
-	<module>spring-data-redis-2.5.5</module>
-	<module>kafka_2.12-2.8.1</module>
-	<module>kafka_2.13-2.8.1</module>
-	<module>kafka-clients-2.8.1</module>
-	<module>kafka-streams-2.8.1</module>
     </modules>
 
 </project>
diff --git a/spring-webflux-5.3.10/pom.xml b/spring-webflux-5.3.10/pom.xml
index e5765d3..0487f3d 100644
--- a/spring-webflux-5.3.10/pom.xml
+++ b/spring-webflux-5.3.10/pom.xml
@@ -56,13 +56,13 @@
 	io.netty.channel;resolution:=optional,
 	io.netty.handler.codec.http;resolution:=optional,
 	io.netty.handler.codec.http.websocketx;resolution:=optional,
-	io.undertow.connector,
-	io.undertow.server,
-	io.undertow.websockets,
-	io.undertow.websockets.client,
-	io.undertow.websockets.core,
-	io.undertow.websockets.core.protocol.version13,
-	io.undertow.websockets.spi,
+	io.undertow.connector;resolution:=optional,
+	io.undertow.server;resolution:=optional,
+	io.undertow.websockets;resolution:=optional,
+	io.undertow.websockets.client;resolution:=optional,
+	io.undertow.websockets.core;resolution:=optional,
+	io.undertow.websockets.core.protocol.version13;resolution:=optional,
+	io.undertow.websockets.spi;resolution:=optional,
 	javax.script,
 	javax.servlet,
 	javax.servlet.http,
@@ -128,7 +128,7 @@
 	org.springframework.scripting.support;version="[${pkgVersion},5.4)",
 	org.springframework.stereotype;version="[${pkgVersion},5.4)",
 	org.springframework.ui;version="[${pkgVersion},5.4)",
-	org.springframework.ui.freemarker;version="[${pkgVersion},5.4)",
+	org.springframework.ui.freemarker;version="[${pkgVersion},5.4)";resolution:=optional,
 	org.springframework.util;version="[${pkgVersion},5.4)",
 	org.springframework.validation;version="[${pkgVersion},5.4)",
 	org.springframework.validation.annotation;version="[${pkgVersion},5.4)",
@@ -147,7 +147,7 @@
 	org.springframework.web.util;version="[${pkgVersion},5.4)",
 	org.springframework.web.util.pattern;version="[${pkgVersion},5.4)",
 	org.webjars;resolution:=optional,
-	org.xnio,
+	org.xnio;resolution:=optional,
 	reactor.core;version="[3.4,4)";resolution:=optional,
 	reactor.core.publisher;version="[3.4,4)";resolution:=optional,
 	reactor.core.scheduler;version="[3.4,4)";resolution:=optional,