diff --git a/atomfeed-client-spring/pom.xml b/atomfeed-client-spring/pom.xml
index ecbb849..97aeba3 100644
--- a/atomfeed-client-spring/pom.xml
+++ b/atomfeed-client-spring/pom.xml
@@ -12,11 +12,6 @@
     <artifactId>atomfeed-client-spring</artifactId>
     <packaging>jar</packaging>
 
-    <properties>
-        <spring.version>3.1.0.RELEASE</spring.version>
-        <log4jVersion>2.17.1</log4jVersion>
-    </properties>
-
     <repositories>
         <repository>
             <id>spring-maven-release</id>
@@ -47,13 +42,13 @@
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-api</artifactId>
-            <version>${log4jVersion}</version>
+            <version>${log4j.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
-            <version>${log4jVersion}</version>
+            <version>${log4j.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -64,13 +59,13 @@
         <dependency>
             <groupId>org.aspectj</groupId>
             <artifactId>aspectjweaver</artifactId>
-            <version>1.7.1</version>
+            <version>${aspectj.version}</version>
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.5</version>
-            <scope>provided</scope>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>${javaxServletApi.version}</version>
+            <scope>test</scope>
         </dependency>
         <!--
         Make all spring dependencies provided
@@ -158,13 +153,13 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>jcl-over-slf4j</artifactId>
-            <version>1.6.1</version>
+            <version>${slf4j.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.8.2</version>
+            <version>${junit.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -186,7 +181,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>2.2</version>
+                <version>${mvnPlugin.version}</version>
                 <configuration>
                     <archive>
                         <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
diff --git a/atomfeed-client/pom.xml b/atomfeed-client/pom.xml
index 9fc8de1..f51e9d6 100644
--- a/atomfeed-client/pom.xml
+++ b/atomfeed-client/pom.xml
@@ -15,7 +15,6 @@
         <jdbc.username>root</jdbc.username>
         <jdbc.password>admin</jdbc.password>
         <jdbc.url>jdbc:h2:~/atomfeed;DATABASE_TO_UPPER=false</jdbc.url>
-        <log4jVersion>2.17.1</log4jVersion>
     </properties>
 
     <dependencies>
@@ -27,13 +26,13 @@
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-api</artifactId>
-            <version>${log4jVersion}</version>
+            <version>${log4j.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
-            <version>${log4jVersion}</version>
+            <version>${log4j.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -64,19 +63,19 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>1.9.5</version>
+            <version>${mockitoCore.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.5</version>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>${javaxServletApi.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.8.2</version>
+            <version>${junit.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -88,7 +87,7 @@
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
-            <version>1.3.174</version>
+            <version>${h2Databaes.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -104,7 +103,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>2.2</version>
+                <version>${mvnPlugin.version}</version>
                 <configuration>
                     <archive>
                         <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
@@ -185,13 +184,6 @@
                     </plugin>
                 </plugins>
             </build>
-            <dependencies>
-                <dependency>
-                    <groupId>com.h2database</groupId>
-                    <artifactId>h2</artifactId>
-                    <version>1.3.174</version>
-                </dependency>
-            </dependencies>
         </profile>
     </profiles>
 
diff --git a/atomfeed-client/src/test/java/org/ict4h/atomfeed/client/service/AtomFeedClientTest.java b/atomfeed-client/src/test/java/org/ict4h/atomfeed/client/service/AtomFeedClientTest.java
index 8ea1ab7..60daa6d 100644
--- a/atomfeed-client/src/test/java/org/ict4h/atomfeed/client/service/AtomFeedClientTest.java
+++ b/atomfeed-client/src/test/java/org/ict4h/atomfeed/client/service/AtomFeedClientTest.java
@@ -85,15 +85,15 @@ public void shouldProcessEventsWithoutFailures() throws URISyntaxException, SQLE
 
         verify(eventWorker).process(argThat(new ArgumentMatcher<Event>() {
             @Override
-            public boolean matches(Object o) {
-                return ((Event) o).getId().equals(entry1.getId()) && ((Event) o).getFeedUri().equals(feedLink);
+            public boolean matches(Event event) {
+                return ((Event) event).getId().equals(entry1.getId()) && ((Event) event).getFeedUri().equals(feedLink);
             }
         }));
         verify(allMarkersMock).put(feedUri, entry1.getId(), new URI(feedLink));
         verify(eventWorker).process(argThat(new ArgumentMatcher<Event>() {
             @Override
-            public boolean matches(Object o) {
-                return ((Event) o).getId().equals(entry2.getId());
+            public boolean matches(Event event) {
+                return ((Event) event).getId().equals(entry2.getId());
             }
         }));
         verify(allMarkersMock).put(feedUri, entry2.getId(), new URI(feedLink));
@@ -136,15 +136,15 @@ public void shouldProcessEventsAndNotUpdateMarkerIfFlagIsFalse() throws URISynta
 
         verify(eventWorker).process(argThat(new ArgumentMatcher<Event>() {
             @Override
-            public boolean matches(Object o) {
-                return ((Event) o).getId().equals(entry1.getId());
+            public boolean matches(Event event) {
+                return ((Event) event).getId().equals(entry1.getId());
             }
         }));
         verify(allMarkersMock, Mockito.never()).put(feedUri, entry1.getId(), new URI(feedLink));
         verify(eventWorker).process(argThat(new ArgumentMatcher<Event>() {
             @Override
-            public boolean matches(Object o) {
-                return ((Event) o).getId().equals(entry2.getId());
+            public boolean matches(Event event) {
+                return ((Event) event).getId().equals(entry2.getId());
             }
         }));
         verify(allMarkersMock, Mockito.never()).put(feedUri, entry2.getId(), new URI(feedLink));
@@ -155,7 +155,7 @@ public void shouldHandleFailedEventInCaseProcessingFailsForAnEvent() throws URIS
         Feed feed = setupFeedWithTwoEvents();
         when(allFeedsMock.getFor(feedUri)).thenReturn(feed);
         when(allFailedEvents.getNumberOfFailedEvents(feedUri.toString())).thenReturn(0);
-        doThrow(Exception.class).when(eventWorker).process(any(Event.class));
+        doThrow(RuntimeException.class).when(eventWorker).process(any(Event.class));
 
         FeedClient feedClient = new AtomFeedClient(allFeedsMock, allMarkersMock, allFailedEvents, new AtomFeedProperties(), transactionManager, feedUri, eventWorker);
         feedClient.processEvents();
@@ -194,7 +194,7 @@ public void shouldStopProcessingEventsInBetweenWhenThereAreTooManyFailedEvents()
         Feed feed = setupFeedWithTwoEvents();
         when(allFeedsMock.getFor(feedUri)).thenReturn(feed);
         when(allFailedEvents.getNumberOfFailedEvents(feedUri.toString())).thenReturn(maxFailedEvents - 1, maxFailedEvents);
-        doThrow(Exception.class).when(eventWorker).process(any(Event.class));
+        doThrow(RuntimeException.class).when(eventWorker).process(any(Event.class));
 
         FeedClient feedClient = new AtomFeedClient(allFeedsMock, allMarkersMock, allFailedEvents, atomFeedProperties, transactionManager, feedUri, eventWorker);
         feedClient.processEvents();
diff --git a/atomfeed-commons/pom.xml b/atomfeed-commons/pom.xml
index df576e4..e747ca0 100644
--- a/atomfeed-commons/pom.xml
+++ b/atomfeed-commons/pom.xml
@@ -10,7 +10,7 @@
     <artifactId>atomfeed-commons</artifactId>
 
     <properties>
-        <log4jVersion>2.17.1</log4jVersion>
+        <commonsLangVersion>3.11</commonsLangVersion>
     </properties>
 
     <dependencies>
@@ -22,31 +22,31 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>1.9.5</version>
+            <version>${mockitoCore.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.8.2</version>
+            <version>${junit.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-api</artifactId>
-            <version>${log4jVersion}</version>
+            <version>${log4j.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
-            <version>${log4jVersion}</version>
+            <version>${log4j.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.1</version>
+            <version>${commonsLangVersion}</version>
         </dependency>
 
     </dependencies>
diff --git a/atomfeed-server/pom.xml b/atomfeed-server/pom.xml
index cc3b7bf..1f5e728 100644
--- a/atomfeed-server/pom.xml
+++ b/atomfeed-server/pom.xml
@@ -12,7 +12,7 @@
     <packaging>jar</packaging>
 
     <properties>
-        <log4jVersion>2.17.1</log4jVersion>
+        <mavenResourcePlugin>3.2.0</mavenResourcePlugin>
     </properties>
 
     <!--<properties>-->
@@ -28,7 +28,7 @@
         <repository>
             <id>javax.transaction</id>
             <name>Repository for javax transaction API</name>
-            <url>http://mvnrepository.com/artifact/javax.transaction/jta/1.1</url>
+            <url>https://mvnrepository.com/artifact/javax.transaction/jta/1.1</url>
         </repository>
     </repositories>
 
@@ -37,7 +37,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>
-                <version>2.5</version>
+                <version>${mavenResourcePlugin}</version>
                 <configuration>
                     <encoding>UTF-8</encoding>
                     <outputDirectory />
@@ -74,7 +74,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>2.2</version>
+                <version>${mavenJarPlugin.version}</version>
                 <configuration>
                     <archive>
                         <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
@@ -132,25 +132,25 @@
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-api</artifactId>
-            <version>${log4jVersion}</version>
+            <version>${log4j.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
-            <version>${log4jVersion}</version>
+            <version>${log4j.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
 			<groupId>org.mockito</groupId>
 			<artifactId>mockito-core</artifactId>
-			<version>1.9.5</version>
+			<version>${mockitoCore.version}</version>
             <scope>test</scope>
 		</dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.8.2</version>
+            <version>${junit.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -168,7 +168,7 @@
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
-            <version>1.3.174</version>
+            <version>${h2Databaes.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -235,13 +235,6 @@
                     </plugin>
                 </plugins>
             </build>
-            <dependencies>
-                <dependency>
-                    <groupId>com.h2database</groupId>
-                    <artifactId>h2</artifactId>
-                    <version>1.3.174</version>
-                </dependency>
-            </dependencies>
         </profile>
     </profiles>
 </project>
diff --git a/atomfeed-server/src/test/java/org/ict4h/atomfeed/server/service/feedgenerator/NumberFeedGeneratorTest.java b/atomfeed-server/src/test/java/org/ict4h/atomfeed/server/service/feedgenerator/NumberFeedGeneratorTest.java
index 517c581..31ada75 100644
--- a/atomfeed-server/src/test/java/org/ict4h/atomfeed/server/service/feedgenerator/NumberFeedGeneratorTest.java
+++ b/atomfeed-server/src/test/java/org/ict4h/atomfeed/server/service/feedgenerator/NumberFeedGeneratorTest.java
@@ -87,7 +87,7 @@ public void shouldRetrieveRecentFeed() throws Exception {
     public void shouldRetrieveEmptyFeedForWhenRecentFeedIsQueriedForWithNoEventsPresent() {
         AllEventRecords eventRecords = mock(AllEventRecords.class);
         feedGenerator = new NumberFeedGenerator(eventRecords, allEventRecordsOffsetMarkers, allChunkingEntries);
-        stub(eventRecords.getTotalCountForCategory(anyString())).toReturn(0);
+        when(eventRecords.getTotalCountForCategory(anyString())).thenReturn(0);
         EventFeed feed = feedGenerator.getRecentFeed("");
 
         Assert.assertEquals(new Integer(0), feed.getId());
diff --git a/atomfeed-spring-server/pom.xml b/atomfeed-spring-server/pom.xml
index 16e5641..cb18279 100644
--- a/atomfeed-spring-server/pom.xml
+++ b/atomfeed-spring-server/pom.xml
@@ -13,11 +13,6 @@
     <artifactId>atomfeed-spring-server</artifactId>
     <packaging>jar</packaging>
 
-    <properties>
-        <spring.version>3.1.0.RELEASE</spring.version>
-        <log4jVersion>2.17.1</log4jVersion>
-    </properties>
-
     <repositories>
         <repository>
             <id>spring-maven-release</id>
@@ -48,13 +43,13 @@
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-api</artifactId>
-            <version>${log4jVersion}</version>
+            <version>${log4j.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
-            <version>${log4jVersion}</version>
+            <version>${log4j.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -65,12 +60,12 @@
         <dependency>
             <groupId>org.aspectj</groupId>
             <artifactId>aspectjweaver</artifactId>
-            <version>1.7.1</version>
+            <version>${aspectj.version}</version>
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.5</version>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>${javaxServletApi.version}</version>
             <scope>provided</scope>
         </dependency>
         <!--
@@ -169,13 +164,13 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>jcl-over-slf4j</artifactId>
-            <version>1.6.1</version>
+            <version>${slf4j.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.8.2</version>
+            <version>${junit.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -196,7 +191,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>2.2</version>
+                <version>${mavenJarPlugin.version}</version>
                 <configuration>
                     <archive>
                         <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
diff --git a/atomfeed-spring-server/src/main/resources/atomFeedContext.xml b/atomfeed-spring-server/src/main/resources/atomFeedContext.xml
index 670468b..dda166a 100644
--- a/atomfeed-spring-server/src/main/resources/atomFeedContext.xml
+++ b/atomfeed-spring-server/src/main/resources/atomFeedContext.xml
@@ -40,7 +40,7 @@
         <aop:advisor advice-ref="noTxAdvice" pointcut-ref="eventFeeds"/>
     </aop:config>
 
-    <bean class="org.springframework.web.servlet.mvc.annotation.AnnotationMethodHandlerAdapter" >
+    <bean class="org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter" >
         <property name="messageConverters">
             <list>
                 <bean class = "org.springframework.http.converter.StringHttpMessageConverter">
diff --git a/pom.xml b/pom.xml
index e066878..f3d64ed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,6 +11,18 @@
 
     <properties>
         <jetty.version>8.1.8.v20121106</jetty.version>
+        <mvnWarPlugin.version>3.3.1</mvnWarPlugin.version>
+        <mavenReleasePlugin.version>2.5.3</mavenReleasePlugin.version>
+        <spring.version>5.2.9.RELEASE</spring.version>
+        <log4j.version>2.17.1</log4j.version>
+        <javaxServletApi.version>4.0.1</javaxServletApi.version>
+        <mockitoCore.version>3.5.11</mockitoCore.version>
+        <junit.version>4.13</junit.version>
+        <h2Databaes.version>1.4.200</h2Databaes.version>
+        <mvnPlugin.version>3.2.0</mvnPlugin.version>
+        <aspectj.version>1.9.6</aspectj.version>
+        <slf4j.version>1.7.36</slf4j.version>
+        <mavenJarPlugin.version>3.2.0</mavenJarPlugin.version>
     </properties>
 
     <parent>
@@ -99,7 +111,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-war-plugin</artifactId>
-                    <version>2.3</version>
+                    <version>${mvnWarPlugin.version}</version>
                     <configuration>
                         <webResources>
                             <resource>
@@ -116,7 +128,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-release-plugin</artifactId>
-                    <version>2.4</version>
+                    <version>${mavenReleasePlugin.version}</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -149,7 +161,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-release-plugin</artifactId>
-                        <version>2.4</version>
+                        <version>${mavenReleasePlugin.version}</version>
                         <configuration>
                             <pushChanges>false</pushChanges>
                             <autoVersionSubmodules>true</autoVersionSubmodules>
@@ -214,23 +226,23 @@
         <repository>
             <id>javax.transaction</id>
             <name>Repository for javax transaction API</name>
-            <url>http://mvnrepository.com/artifact/javax.transaction/jta/1.1</url>
+            <url>https://mvnrepository.com/artifact/javax.transaction/jta/1.1</url>
         </repository>
         <repository>
             <id>maven2-repository.dev.java.net</id>
             <name>Java.net Repository for Maven</name>
-            <url>http://download.java.net/maven/2/</url>
+            <url>https://download.java.net/maven/2/</url>
             <layout>default</layout>
         </repository>
         <repository>
             <id>com.springsource.repository.bundles.release</id>
             <name>SpringSource Enterprise Bundle Repository - SpringSource Bundle Releases</name>
-            <url>http://repository.springsource.com/maven/bundles/release</url>
+            <url>https://repository.springsource.com/maven/bundles/release</url>
         </repository>
         <repository>
             <id>com.springsource.repository.bundles.external</id>
             <name>SpringSource Enterprise Bundle Repository - External Bundle Releases</name>
-            <url>http://repository.springsource.com/maven/bundles/external</url>
+            <url>https://repository.springsource.com/maven/bundles/external</url>
         </repository>
     </repositories>