cshannon commented on code in PR #2102:
URL: https://github.com/apache/activemq/pull/2102#discussion_r3639865352


##########
activemq-web-console/pom.xml:
##########
@@ -139,12 +139,12 @@
               javax.management.remote,
               javax.naming,
               org.w3c.dom,
-              jakarta.servlet;version="[5,6)",
-              jakarta.servlet.annotation;version="[5,6)",
-              jakarta.servlet.http;version="[5,6)",
-              jakarta.servlet.jsp,
-              jakarta.servlet.jsp.tagext,
-              jakarta.servlet.jsp.el,
+              jakarta.servlet;version="[5,7)",

Review Comment:
   Should all of the servlet ones be `[6,7)` ? EE 11 is 6.1



##########
activemq-karaf/src/main/resources/features.xml:
##########
@@ -49,6 +50,11 @@
     <feature name="activemq-web-console" version="${project.version}">
       <feature>war</feature>
       <feature>eventadmin</feature>
+      <feature version="[7,8)">spring-web</feature>

Review Comment:
   Shouldn't we use `${spring-version-range}` here?



##########
activemq-karaf/src/main/resources/features-core.xml:
##########
@@ -20,18 +20,39 @@
 
 <features name="activemq-core-${project.version}" 
xmlns="http://karaf.apache.org/xmlns/features/v1.4.0";>
 
+    <!--
+        Spring 7.x support. Apache Karaf only provides Spring up to 6.1.x and 
there are no
+        ServiceMix OSGi wrappers for Spring 7 yet, so the plain Spring 
Framework jars (which
+        no longer ship OSGi metadata) are wrapped on the fly with the pax-url 
wrap: protocol.
+    -->
+    <feature name="spring" description="Spring 7.x support" 
version="${spring-version}">
+        <bundle 
start-level="30">wrap:mvn:org.springframework/spring-core/${spring-version}$Bundle-SymbolicName=org.springframework.spring-core&amp;Bundle-Version=${spring-version}&amp;Export-Package=org.springframework.*;version=${spring-version}&amp;Import-Package=*;resolution:=optional</bundle>
+        <bundle 
start-level="30">wrap:mvn:org.springframework/spring-expression/${spring-version}$Bundle-SymbolicName=org.springframework.spring-expression&amp;Bundle-Version=${spring-version}&amp;Export-Package=org.springframework.*;version=${spring-version}&amp;Import-Package=*;resolution:=optional</bundle>
+        <bundle 
start-level="30">wrap:mvn:org.springframework/spring-beans/${spring-version}$Bundle-SymbolicName=org.springframework.spring-beans&amp;Bundle-Version=${spring-version}&amp;Export-Package=org.springframework.*;version=${spring-version}&amp;Import-Package=*;resolution:=optional</bundle>
+        <bundle 
start-level="30">wrap:mvn:org.springframework/spring-aop/${spring-version}$Bundle-SymbolicName=org.springframework.spring-aop&amp;Bundle-Version=${spring-version}&amp;Export-Package=org.springframework.*,org.aopalliance.*;version=${spring-version}&amp;Import-Package=*;resolution:=optional</bundle>
+        <bundle 
start-level="30">wrap:mvn:org.springframework/spring-context/${spring-version}$Bundle-SymbolicName=org.springframework.spring-context&amp;Bundle-Version=${spring-version}&amp;Export-Package=org.springframework.*;version=${spring-version}&amp;Import-Package=*;resolution:=optional</bundle>
+        <bundle 
start-level="30">wrap:mvn:org.springframework/spring-context-support/${spring-version}$Bundle-SymbolicName=org.springframework.spring-context-support&amp;Bundle-Version=${spring-version}&amp;Export-Package=org.springframework.*;version=${spring-version}&amp;Import-Package=*;resolution:=optional</bundle>
+    </feature>
+
+    <feature name="spring-web" description="Spring 7.x Web support" 
version="${spring-version}">
+        <feature version="[7,8)">spring</feature>
+        <bundle 
dependency="true">mvn:jakarta.servlet/jakarta.servlet-api/${jakarta-servlet-api-version}</bundle>
+        <bundle 
start-level="30">wrap:mvn:org.springframework/spring-web/${spring-version}$Bundle-SymbolicName=org.springframework.spring-web&amp;Bundle-Version=${spring-version}&amp;Export-Package=org.springframework.*;version=${spring-version}&amp;Import-Package=*;resolution:=optional</bundle>
+        <bundle 
start-level="30">wrap:mvn:org.springframework/spring-webmvc/${spring-version}$Bundle-SymbolicName=org.springframework.spring-webmvc&amp;Bundle-Version=${spring-version}&amp;Export-Package=org.springframework.*;version=${spring-version}&amp;Import-Package=*;resolution:=optional</bundle>
+    </feature>
+
     <!-- Bundles needed if only client will be deployed in the container -->
     <feature name="activemq-client" description="ActiveMQ client libraries" 
version="${project.version}">
-        <feature version="[5,7)">spring</feature>
+        <feature version="[7,8)">spring</feature>

Review Comment:
   We should use ${spring-version-range} here



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: [email protected]

For queries about this service, please contact Infrastructure at:
[email protected]


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information, visit: https://activemq.apache.org/contact


Reply via email to