inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)

Browse Source 
78702: Align versions of dependencies - especially Surf ones - and declare them in parent pom for consistency
   Upgrade a few Maven plugins as well


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82632 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Erik Winlof
2014-09-03 12:52:47 +00:00
parent 1607f81742
commit 37b45ae065
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pom.xml
View File

@@ -18,7 +18,6 @@
<dependency> <dependency>
<groupId>javax.servlet</groupId> <groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId> <artifactId>servlet-api</artifactId>
<version>2.4</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
@@ -91,7 +90,7 @@
<dependency> <dependency>
<groupId>rome</groupId> <groupId>rome</groupId>
<artifactId>rome</artifactId> <artifactId>rome</artifactId>
<version>0.9</version> <version>1.0</version>
</dependency> </dependency>
<!-- This is needed at runtime by Web Client, so not really a test dependency --> <!-- This is needed at runtime by Web Client, so not really a test dependency -->
@@ -148,7 +147,6 @@
<dependency> <dependency>
<groupId>mysql</groupId> <groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId> <artifactId>mysql-connector-java</artifactId>
<version>5.1.14</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
@@ -159,7 +157,6 @@
<dependency> <dependency>
<groupId>com.h2database</groupId> <groupId>com.h2database</groupId>
<artifactId>h2</artifactId> <artifactId>h2</artifactId>
<version>1.3.167</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>

6
source/java/org/alfresco/opencmis/CMISServletDispatcher.java
View File

@@ -259,6 +259,12 @@ public abstract class CMISServletDispatcher implements CMISDispatcher
return null; return null;
} }
@Override
public String getContextPath()
{
return null;
}
@Override @Override
public ServletContext getContext(String arg0) public ServletContext getContext(String arg0)
{ {