grgrzybek commented on PR #453:
URL: https://github.com/apache/aries/pull/453#issuecomment-2653194263

   @alien11689 this will help (I can't update this PR and I don't want to 
create another one):
   ```
   commit 7ae3080a3f40f93ced2e46b38bdfd4d63b29b694
   Author: Grzegorz Grzybek <gr.grzy...@gmail.com>
   Date:   Wed Feb 12 10:54:27 2025 +0100
   
       [MAINTENANCE] Update Servlet API to version compatible with Pax Web 8
   
   diff --git a/jndi/jndi-url-itest/pom.xml b/jndi/jndi-url-itest/pom.xml
   index 3c8d407b2..6c547bd0d 100644
   --- a/jndi/jndi-url-itest/pom.xml
   +++ b/jndi/jndi-url-itest/pom.xml
   @@ -47,7 +47,7 @@
            <cm.version>3.2.0-v20070116</cm.version>
            <depends-maven-plugin.version>1.5.0</depends-maven-plugin.version>
            <javax.annotation-api.version>1.3.2</javax.annotation-api.version>
   -        <javax.servlet-api.version>3.1.0</javax.servlet-api.version>
   +        <jakarta.servlet-api.version>4.0.4</jakarta.servlet-api.version>
            <jndi-api.version>${jndi-api.dev-version}</jndi-api.version>
            
<jndi-bundle.version>${jndi-bundle.dev-version}</jndi-bundle.version>
            
<jndi-url-itest-biz.version>${jndi-url-itest-biz.dev-version}</jndi-url-itest-biz.version>
   @@ -281,9 +281,9 @@
                <scope>test</scope>
            </dependency>
            <dependency>
   -            <groupId>javax.servlet</groupId>
   -            <artifactId>javax.servlet-api</artifactId>
   -            <version>${javax.servlet-api.version}</version>
   +            <groupId>jakarta.servlet</groupId>
   +            <artifactId>jakarta.servlet-api</artifactId>
   +            <version>${jakarta.servlet-api.version}</version>
                <scope>test</scope>
            </dependency>
            <dependency>
   diff --git 
a/jndi/jndi-url-itest/src/test/java/org/apache/aries/jndi/itests/JndiUrlIntegrationTest.java
 
b/jndi/jndi-url-itest/src/test/java/org/apache/aries/jndi/itests/JndiUrlIntegrationTest.java
   index a9f920ccc..1f1dc07e7 100644
   --- 
a/jndi/jndi-url-itest/src/test/java/org/apache/aries/jndi/itests/JndiUrlIntegrationTest.java
   +++ 
b/jndi/jndi-url-itest/src/test/java/org/apache/aries/jndi/itests/JndiUrlIntegrationTest.java
   @@ -151,7 +151,7 @@ public class JndiUrlIntegrationTest extends 
AbstractIntegrationTest {
                    // Bundles
                    mavenBundle("org.eclipse.equinox", 
"cm").versionAsInProject(),
                    mavenBundle("org.eclipse.osgi", 
"org.eclipse.osgi.services").versionAsInProject(),
   -                mavenBundle("javax.servlet", 
"javax.servlet-api").versionAsInProject(),
   +                mavenBundle("jakarta.servlet", 
"jakarta.servlet-api").versionAsInProject(),
                    mavenBundle("javax.annotation", 
"javax.annotation-api").versionAsInProject(),
    
                    mavenBundle("org.ops4j.pax.web", 
"pax-web-extender-war").versionAsInProject(),
   ```


-- 
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: dev-unsubscr...@aries.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

Reply via email to