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

martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva.git

commit 9c0449cc94e85394b33089658fb6471f67b92e11
Author: Martin Stockhammer <[email protected]>
AuthorDate: Sun Jan 26 11:13:53 2020 +0100

    Switching to servlet version 4
---
 pom.xml | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 869d22e..764e431 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,6 +48,12 @@
   </scm>
 
   <properties>
+    <redback.version>3.0.0-SNAPSHOT</redback.version>
+
+    <!-- Java Enterprise APIs -->
+    <javax.servlet.version>4.0.1</javax.servlet.version>
+
+
     <commons-codec.version>1.13</commons-codec.version>
     <commons-collections.version>4.4</commons-collections.version>
     <commons-fileupload.version>1.4</commons-fileupload.version>
@@ -60,17 +66,14 @@
     <maven-model-converter.version>2.3</maven-model-converter.version>
     <wagon.version>3.3.3</wagon.version>
 
-    <redback.version>3.0.0-SNAPSHOT</redback.version>
+
+
 
     <!-- dependencies of maven modules -->
     <jsoup.version>1.12.1</jsoup.version>
     <rome.version>1.12.2</rome.version>
     <cronutils.version>9.0.1</cronutils.version>
 
-    <spring.version>4.3.10.RELEASE</spring.version>
-
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <surefire.redirectTestOutputToFile>true</surefire.redirectTestOutputToFile>
     <lucene.version>4.10.4</lucene.version>
 
     <!-- JCR modules -->
@@ -95,6 +98,10 @@
     
<redbackTestJdbcUrl>jdbc:derby:memory:users-test;create=true</redbackTestJdbcUrl>
     
<redbackTestJdbcDriver>org.apache.derby.jdbc.EmbeddedDriver</redbackTestJdbcDriver>
 
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <surefire.redirectTestOutputToFile>true</surefire.redirectTestOutputToFile>
+
+
     <sisu-inject-plexus.version>0.3.3</sisu-inject-plexus.version>
     <plexus-digest.version>1.1</plexus-digest.version>
     
<plexus-expression-evaluator.version>2.1</plexus-expression-evaluator.version>
@@ -1342,7 +1349,7 @@
       <dependency>
         <groupId>javax.servlet</groupId>
         <artifactId>javax.servlet-api</artifactId>
-        <version>3.1.0</version>
+        <version>${javax.servlet.version}</version>
       </dependency>
       <dependency>
         <groupId>org.slf4j</groupId>

Reply via email to