mirror of
https://github.com/SonarSource/sonarqube.git
synced 2024-08-07 15:05:55 +02:00
SONAR-4044 move to Java 6
- update jdk signature used by animal sniffer - update javac configuration - fix blueprints-core lib - upgrade commons-dbcp and postgresql driver in order to use JDBC 4
This commit is contained in:
parent
003fdb73a1
commit
bf5a5beba1
20
pom.xml
20
pom.xml
@ -77,15 +77,15 @@
|
||||
<jetty.version>6.1.25</jetty.version>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<maven.min.version>2.2.1</maven.min.version>
|
||||
<jdk.min.version>1.5</jdk.min.version>
|
||||
<jdk.min.version>1.6</jdk.min.version>
|
||||
<timestamp>${maven.build.timestamp}</timestamp>
|
||||
<maven.build.timestamp.format>yyyy-MM-dd'T'HH:mm:ssZ</maven.build.timestamp.format>
|
||||
|
||||
<!-- To configure animal-sniffer to check API compat -->
|
||||
<animal-sniffer.signature.groupId>org.codehaus.mojo.signature</animal-sniffer.signature.groupId>
|
||||
<animal-sniffer.signature.artifactId>java15</animal-sniffer.signature.artifactId>
|
||||
<animal-sniffer.signature.version>1.0</animal-sniffer.signature.version>
|
||||
<version.animal-sniffer.plugin>1.7</version.animal-sniffer.plugin>
|
||||
<animal-sniffer.signature.artifactId>java16</animal-sniffer.signature.artifactId>
|
||||
<animal-sniffer.signature.version>1.1</animal-sniffer.signature.version>
|
||||
<version.animal-sniffer.plugin>1.9</version.animal-sniffer.plugin>
|
||||
<version.maven-license.plugin>1.9.0</version.maven-license.plugin>
|
||||
<skipSanityChecks>false</skipSanityChecks>
|
||||
|
||||
@ -654,9 +654,9 @@
|
||||
<version>2.2.3</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.codehaus.sonar</groupId>
|
||||
<artifactId>sonar-blueprints-core</artifactId>
|
||||
<version>2.2.0-java5</version>
|
||||
<groupId>com.tinkerpop.blueprints</groupId>
|
||||
<artifactId>blueprints-core</artifactId>
|
||||
<version>2.2.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>commons-collections</groupId>
|
||||
@ -696,8 +696,7 @@
|
||||
<dependency>
|
||||
<groupId>commons-dbcp</groupId>
|
||||
<artifactId>commons-dbcp</artifactId>
|
||||
<!-- do not upgrade to version 1.4, not compatible with Java5 -->
|
||||
<version>1.3</version>
|
||||
<version>1.4</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<!-- See SONAR-2512 -->
|
||||
@ -838,8 +837,7 @@
|
||||
<dependency>
|
||||
<groupId>postgresql</groupId>
|
||||
<artifactId>postgresql</artifactId>
|
||||
<!-- do not upgrade to version 9.1-901.jdbc4, not compatible with Java 5 -->
|
||||
<version>9.1-901.jdbc3</version>
|
||||
<version>9.1-901-1.jdbc4</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>net.sourceforge.jtds</groupId>
|
||||
|
@ -69,9 +69,8 @@
|
||||
<artifactId>json-simple</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<!-- version compiled for java 5 -->
|
||||
<groupId>org.codehaus.sonar</groupId>
|
||||
<artifactId>sonar-blueprints-core</artifactId>
|
||||
<groupId>com.tinkerpop.blueprints</groupId>
|
||||
<artifactId>blueprints-core</artifactId>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<groupId>org.codehaus.jackson</groupId>
|
||||
|
@ -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();
|
||||
|
@ -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())) {
|
||||
|
@ -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() {
|
||||
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user