POMs: fixed servlet-api dependency to current version

Evolveum · Apr 29, 2020 · ea89d54 · ea89d54
1 parent 1010828
commit ea89d54
Show file tree

Hide file tree

Showing 17 changed files with 259 additions and 256 deletions.
diff --git a/gui/admin-gui/pom.xml b/gui/admin-gui/pom.xml
@@ -803,7 +803,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
             <scope>provided</scope>
         </dependency>
 

diff --git a/model/certification-impl/pom.xml b/model/certification-impl/pom.xml
@@ -267,7 +267,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency> <!-- needed as runtime dependency otherwise spring won't start -->

diff --git a/model/model-api/pom.xml b/model/model-api/pom.xml
@@ -100,7 +100,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
             <scope>compile</scope>
         </dependency>
     </dependencies>

diff --git a/model/model-impl/pom.xml b/model/model-impl/pom.xml
@@ -386,7 +386,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
             <!-- TODO: compile scope for ModelRestService - I think it should go to more infrastructural module (Virgo) -->
             <!--<scope>test</scope>-->
         </dependency>

diff --git a/model/model-intest/pom.xml b/model/model-intest/pom.xml
@@ -267,7 +267,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/model/model-test/pom.xml b/model/model-test/pom.xml
@@ -182,7 +182,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.forgerock.opendj</groupId>

diff --git a/model/notifications-impl/pom.xml b/model/notifications-impl/pom.xml
@@ -236,7 +236,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/model/report-impl/pom.xml b/model/report-impl/pom.xml
@@ -298,7 +298,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/model/workflow-impl/pom.xml b/model/workflow-impl/pom.xml
@@ -282,7 +282,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency> <!-- needed as runtime dependency otherwise spring won't start -->

diff --git a/pom.xml b/pom.xml
@@ -605,8 +605,8 @@
             </dependency>
             <dependency>
                 <groupId>javax.servlet</groupId>
-                <artifactId>servlet-api</artifactId>
-                <version>2.5</version>
+                <artifactId>javax.servlet-api</artifactId>
+                <version>4.0.1</version>
                 <scope>provided</scope>
             </dependency>
             <dependency>
@@ -1826,6 +1826,9 @@
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-deploy-plugin</artifactId>
                     <version>2.8.2</version>
+                    <configuration>
+                        <deployAtEnd>true</deployAtEnd>
+                    </configuration>
                 </plugin>
                 <plugin>
                     <groupId>org.eclipse.m2e</groupId>

diff --git a/repo/security-api/pom.xml b/repo/security-api/pom.xml
@@ -59,7 +59,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>

diff --git a/repo/security-enforcer-api/pom.xml b/repo/security-enforcer-api/pom.xml
@@ -53,7 +53,7 @@
 
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
     </dependencies>
 </project>