You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2011/08/09 15:05:13 UTC
svn commit: r1155349 - in /incubator/lcf/branches/CONNECTORS-224: ./
framework/jetty-runner/pom.xml tests/cmis/pom.xml tests/filesystem/pom.xml
tests/sharepoint/pom.xml
Author: kwright
Date: Tue Aug 9 13:05:12 2011
New Revision: 1155349
URL: http://svn.apache.org/viewvc?rev=1155349&view=rev
Log:
Pull up more fixes to the maven build
Modified:
incubator/lcf/branches/CONNECTORS-224/ (props changed)
incubator/lcf/branches/CONNECTORS-224/framework/jetty-runner/pom.xml
incubator/lcf/branches/CONNECTORS-224/tests/cmis/pom.xml
incubator/lcf/branches/CONNECTORS-224/tests/filesystem/pom.xml
incubator/lcf/branches/CONNECTORS-224/tests/sharepoint/pom.xml
Propchange: incubator/lcf/branches/CONNECTORS-224/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 9 13:05:12 2011
@@ -6,4 +6,4 @@
/incubator/lcf/branches/CONNECTORS-223:1146689-1146810
/incubator/lcf/branches/CONNECTORS-236:1153921-1154314
/incubator/lcf/branches/CONNECTORS-32:1092556-1094216
-/incubator/lcf/trunk:1155186
+/incubator/lcf/trunk:1155186,1155345
Modified: incubator/lcf/branches/CONNECTORS-224/framework/jetty-runner/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-224/framework/jetty-runner/pom.xml?rev=1155349&r1=1155348&r2=1155349&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-224/framework/jetty-runner/pom.xml (original)
+++ incubator/lcf/branches/CONNECTORS-224/framework/jetty-runner/pom.xml Tue Aug 9 13:05:12 2011
@@ -104,21 +104,18 @@
<artifactId>mcf-api-service</artifactId>
<version>${project.version}</version>
<type>war</type>
- <scope>runtime</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>mcf-authority-service</artifactId>
<version>${project.version}</version>
<type>war</type>
- <scope>runtime</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>mcf-crawler-ui</artifactId>
<version>${project.version}</version>
<type>war</type>
- <scope>runtime</scope>
</dependency>
<dependency>
Modified: incubator/lcf/branches/CONNECTORS-224/tests/cmis/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-224/tests/cmis/pom.xml?rev=1155349&r1=1155348&r2=1155349&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-224/tests/cmis/pom.xml (original)
+++ incubator/lcf/branches/CONNECTORS-224/tests/cmis/pom.xml Tue Aug 9 13:05:12 2011
@@ -107,28 +107,24 @@
<artifactId>chemistry-opencmis-server-inmemory-war</artifactId>
<version>0.5.0-SNAPSHOT</version>
<type>war</type>
- <scope>runtime</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>mcf-api-service</artifactId>
<version>${project.version}</version>
<type>war</type>
- <scope>runtime</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>mcf-authority-service</artifactId>
<version>${project.version}</version>
<type>war</type>
- <scope>runtime</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>mcf-crawler-ui</artifactId>
<version>${project.version}</version>
<type>war</type>
- <scope>runtime</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -152,18 +148,15 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>mcf-filesystem-connector</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
<artifactId>mcf-cmis-connector</artifactId>
<version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>mcf-nulloutput-connector</artifactId>
<version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
@@ -228,11 +221,11 @@
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
<version>${derby.version}</version>
- <scope>runtime</scope>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
+ <artifactId>commons-httpclient-mcf</artifactId>
<version>3.1</version>
</dependency>
Modified: incubator/lcf/branches/CONNECTORS-224/tests/filesystem/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-224/tests/filesystem/pom.xml?rev=1155349&r1=1155348&r2=1155349&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-224/tests/filesystem/pom.xml (original)
+++ incubator/lcf/branches/CONNECTORS-224/tests/filesystem/pom.xml Tue Aug 9 13:05:12 2011
@@ -92,21 +92,18 @@
<artifactId>mcf-api-service</artifactId>
<version>${project.version}</version>
<type>war</type>
- <scope>runtime</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>mcf-authority-service</artifactId>
<version>${project.version}</version>
<type>war</type>
- <scope>runtime</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>mcf-crawler-ui</artifactId>
<version>${project.version}</version>
<type>war</type>
- <scope>runtime</scope>
</dependency>
<dependency>
@@ -128,11 +125,13 @@
<groupId>${project.groupId}</groupId>
<artifactId>mcf-filesystem-connector</artifactId>
<version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>mcf-nulloutput-connector</artifactId>
<version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
@@ -145,14 +144,14 @@
<version>6.1.14</version>
</dependency>
<dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.1</version>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.1</version>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
- <artifactId>jsp-2.1-glassfish</artifactId>
- <version>2.1.v20091210</version>
+ <artifactId>jsp-2.1-glassfish</artifactId>
+ <version>2.1.v20091210</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -200,9 +199,9 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <version>3.1</version>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient-mcf</artifactId>
+ <version>3.1</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: incubator/lcf/branches/CONNECTORS-224/tests/sharepoint/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-224/tests/sharepoint/pom.xml?rev=1155349&r1=1155348&r2=1155349&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-224/tests/sharepoint/pom.xml (original)
+++ incubator/lcf/branches/CONNECTORS-224/tests/sharepoint/pom.xml Tue Aug 9 13:05:12 2011
@@ -36,21 +36,18 @@
<artifactId>mcf-api-service</artifactId>
<version>${project.version}</version>
<type>war</type>
- <scope>runtime</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>mcf-authority-service</artifactId>
<version>${project.version}</version>
<type>war</type>
- <scope>runtime</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>mcf-crawler-ui</artifactId>
<version>${project.version}</version>
<type>war</type>
- <scope>runtime</scope>
</dependency>
<dependency>
@@ -89,5 +86,10 @@
<version>${derby.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient-mcf</artifactId>
+ <version>3.1</version>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file