Author: kwright
Date: Fri Feb 8 15:33:57 2013
New Revision: 1444074
URL: http://svn.apache.org/r1444074
Log:
Pull up fix for CONNECTORS-639 from trunk.
Modified:
manifoldcf/branches/release-1.1-branch/ (props changed)
manifoldcf/branches/release-1.1-branch/CHANGES.txt
manifoldcf/branches/release-1.1-branch/framework/jetty-runner/pom.xml
Propchange: manifoldcf/branches/release-1.1-branch/
------------------------------------------------------------------------------
Merged /manifoldcf/trunk:r1444032
Modified: manifoldcf/branches/release-1.1-branch/CHANGES.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/release-1.1-branch/CHANGES.txt?rev=1444074&r1=1444073&r2=1444074&view=diff
==============================================================================
--- manifoldcf/branches/release-1.1-branch/CHANGES.txt (original)
+++ manifoldcf/branches/release-1.1-branch/CHANGES.txt Fri Feb 8 15:33:57 2013
@@ -3,6 +3,9 @@ $Id$
======================= Release 1.1.1 =====================
+CONNECTORS-639: Maven execute of jetty-runner fails.
+(Maciej Li¿ewski)
+
CONNECTORS-638: Fix issue with database pool constriction due to
connection expiration.
(Erlend Garåsen, Maciej Li¿ewski, Karl Wright)
Modified: manifoldcf/branches/release-1.1-branch/framework/jetty-runner/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/release-1.1-branch/framework/jetty-runner/pom.xml?rev=1444074&r1=1444073&r2=1444074&view=diff
==============================================================================
--- manifoldcf/branches/release-1.1-branch/framework/jetty-runner/pom.xml
(original)
+++ manifoldcf/branches/release-1.1-branch/framework/jetty-runner/pom.xml Fri
Feb 8 15:33:57 2013
@@ -207,7 +207,7 @@
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>${servlet-api.version}</version>
- <scope>provided</scope>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
