diff --git a/pom.xml b/pom.xml
index f8e8276b8ff..3f412da00dd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -77,15 +77,15 @@
6.1.25
UTF-8
2.2.1
- 1.5
+ 1.6
${maven.build.timestamp}
yyyy-MM-dd'T'HH:mm:ssZ
org.codehaus.mojo.signature
- java15
- 1.0
- 1.7
+ java16
+ 1.1
+ 1.9
1.9.0
false
@@ -654,9 +654,9 @@
2.2.3
- org.codehaus.sonar
- sonar-blueprints-core
- 2.2.0-java5
+ com.tinkerpop.blueprints
+ blueprints-core
+ 2.2.0
commons-collections
@@ -696,8 +696,7 @@
commons-dbcp
commons-dbcp
-
- 1.3
+ 1.4
@@ -838,8 +837,7 @@
postgresql
postgresql
-
- 9.1-901.jdbc3
+ 9.1-901-1.jdbc4
net.sourceforge.jtds
diff --git a/sonar-core/pom.xml b/sonar-core/pom.xml
index df05ec263d6..ca0e3488548 100644
--- a/sonar-core/pom.xml
+++ b/sonar-core/pom.xml
@@ -69,9 +69,8 @@
json-simple
-
- org.codehaus.sonar
- sonar-blueprints-core
+ com.tinkerpop.blueprints
+ blueprints-core
org.codehaus.jackson
diff --git a/sonar-server/src/main/java/org/sonar/server/platform/MasterServletFilter.java b/sonar-server/src/main/java/org/sonar/server/platform/MasterServletFilter.java
index 56bb22aac1d..0126e8d6886 100644
--- a/sonar-server/src/main/java/org/sonar/server/platform/MasterServletFilter.java
+++ b/sonar-server/src/main/java/org/sonar/server/platform/MasterServletFilter.java
@@ -53,6 +53,7 @@ public class MasterServletFilter implements Filter {
INSTANCE = this;
}
+ @Override
public void init(FilterConfig config) throws ServletException {
// Filters are already available in picocontainer unless a database migration is required. See org.sonar.server.startup.RegisterServletFilters.
init(config, Platform.getInstance().getContainer().getComponentsByType(ServletFilter.class));
@@ -77,6 +78,7 @@ public class MasterServletFilter implements Filter {
filters = filterList.toArray(new ServletFilter[filterList.size()]);
}
+ @Override
public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws ServletException, IOException {
HttpServletRequest hsr = (HttpServletRequest) request;
if (filters.length == 0) {
@@ -94,6 +96,7 @@ public class MasterServletFilter implements Filter {
}
}
+ @Override
public void destroy() {
for (ServletFilter filter : filters) {
filter.destroy();
diff --git a/sonar-server/src/main/java/org/sonar/server/qualitymodel/DefaultModelManager.java b/sonar-server/src/main/java/org/sonar/server/qualitymodel/DefaultModelManager.java
index 30c0c63e57a..300b53153d0 100644
--- a/sonar-server/src/main/java/org/sonar/server/qualitymodel/DefaultModelManager.java
+++ b/sonar-server/src/main/java/org/sonar/server/qualitymodel/DefaultModelManager.java
@@ -52,6 +52,7 @@ public final class DefaultModelManager implements ServerComponent, ModelManager
/**
* Executed when the server starts
*/
+ @Override
public ModelManager registerDefinitions() {
DatabaseSession session = sessionFactory.getSession();
for (ModelDefinition definition : definitions) {
@@ -68,6 +69,7 @@ public final class DefaultModelManager implements ServerComponent, ModelManager
return this;
}
+ @Override
public Model reset(String name) {
ModelDefinition definition = findDefinitionByName(name);
if (definition == null) {
@@ -93,7 +95,7 @@ public final class DefaultModelManager implements ServerComponent, ModelManager
throw e;
}
}
-
+ @Override
public ModelDefinition findDefinitionByName(String name) {
for (ModelDefinition definition : definitions) {
if (StringUtils.equals(name, definition.getName())) {
diff --git a/sonar-server/src/main/java/org/sonar/server/ui/DatabaseSessionFilter.java b/sonar-server/src/main/java/org/sonar/server/ui/DatabaseSessionFilter.java
index 99fc8e7cd7c..5da45b01d90 100644
--- a/sonar-server/src/main/java/org/sonar/server/ui/DatabaseSessionFilter.java
+++ b/sonar-server/src/main/java/org/sonar/server/ui/DatabaseSessionFilter.java
@@ -26,10 +26,12 @@ import java.io.IOException;
import javax.servlet.*;
public class DatabaseSessionFilter implements Filter {
+ @Override
public void init(FilterConfig filterConfig) throws ServletException {
}
+ @Override
public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
chain.doFilter(request, response);
@@ -39,6 +41,7 @@ public class DatabaseSessionFilter implements Filter {
}
}
+ @Override
public void destroy() {
}