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 2014/05/26 20:47:33 UTC
svn commit: r1597627 - in /manifoldcf/branches/release-1.6-branch: ./
framework/agents/ framework/api-service/ framework/authority-service/
framework/combined-service/ framework/core/ framework/crawler-ui/
framework/pull-agent/ framework/ui-core/
Author: kwright
Date: Mon May 26 18:47:32 2014
New Revision: 1597627
URL: http://svn.apache.org/r1597627
Log:
Pull up fix for CONNECTORS-944 from trunk
Modified:
manifoldcf/branches/release-1.6-branch/ (props changed)
manifoldcf/branches/release-1.6-branch/CHANGES.txt
manifoldcf/branches/release-1.6-branch/framework/agents/pom.xml
manifoldcf/branches/release-1.6-branch/framework/api-service/pom.xml
manifoldcf/branches/release-1.6-branch/framework/authority-service/pom.xml
manifoldcf/branches/release-1.6-branch/framework/combined-service/pom.xml
manifoldcf/branches/release-1.6-branch/framework/core/pom.xml
manifoldcf/branches/release-1.6-branch/framework/crawler-ui/pom.xml
manifoldcf/branches/release-1.6-branch/framework/pull-agent/pom.xml
manifoldcf/branches/release-1.6-branch/framework/ui-core/pom.xml
manifoldcf/branches/release-1.6-branch/pom.xml
Propchange: manifoldcf/branches/release-1.6-branch/
------------------------------------------------------------------------------
Merged /manifoldcf/trunk:r1597471,1597625
Modified: manifoldcf/branches/release-1.6-branch/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.6-branch/CHANGES.txt?rev=1597627&r1=1597626&r2=1597627&view=diff
==============================================================================
--- manifoldcf/branches/release-1.6-branch/CHANGES.txt (original)
+++ manifoldcf/branches/release-1.6-branch/CHANGES.txt Mon May 26 18:47:32 2014
@@ -3,6 +3,10 @@ $Id$
======================= Release 1.6.1 =====================
+CONNECTORS-944: Maven build has different stuff in war file than
+ant build.
+(Arcadius Ahouansou, Karl Wright)
+
CONNECTORS-943: .aspx files not indexed by Sharepoint connector due to
missing mime type in core.
Modified: manifoldcf/branches/release-1.6-branch/framework/agents/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.6-branch/framework/agents/pom.xml?rev=1597627&r1=1597626&r2=1597627&view=diff
==============================================================================
--- manifoldcf/branches/release-1.6-branch/framework/agents/pom.xml (original)
+++ manifoldcf/branches/release-1.6-branch/framework/agents/pom.xml Mon May 26 18:47:32 2014
@@ -64,6 +64,7 @@
<artifactId>mcf-core</artifactId>
<version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -95,5 +96,6 @@
<version>${derby.version}</version>
<scope>test</scope>
</dependency>
+
</dependencies>
</project>
\ No newline at end of file
Modified: manifoldcf/branches/release-1.6-branch/framework/api-service/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.6-branch/framework/api-service/pom.xml?rev=1597627&r1=1597626&r2=1597627&view=diff
==============================================================================
--- manifoldcf/branches/release-1.6-branch/framework/api-service/pom.xml (original)
+++ manifoldcf/branches/release-1.6-branch/framework/api-service/pom.xml Mon May 26 18:47:32 2014
@@ -61,76 +61,106 @@
<!-- runtime dependencies -->
<dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>${commons-io.version}</version>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>${slf4j.version}</version>
<scope>runtime</scope>
</dependency>
+
+ <!-- database dependencies -->
<dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>${commons-codec.version}</version>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>${derby.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>commons-el</groupId>
- <artifactId>commons-el</artifactId>
- <version>${commons-el.version}</version>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbytools</artifactId>
+ <version>${derby.version}</version>
<scope>runtime</scope>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>${httpcomponent.httpclient.version}</version>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbynet</artifactId>
+ <version>${derby.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>${commons-collections.version}</version>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbyLocale_it</artifactId>
+ <version>${derby.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- <version>${commons-fileupload.version}</version>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbyLocale_de_DE</artifactId>
+ <version>${derby.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>xalan</groupId>
- <artifactId>serializer</artifactId>
- <version>${xalan.version}</version>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbyLocale_es</artifactId>
+ <version>${derby.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>${xerces.version}</version>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbyLocale_ja_JP</artifactId>
+ <version>${derby.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- <version>${xml-apis.version}</version>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbyLocale_cs</artifactId>
+ <version>${derby.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>${commons-logging.version}</version>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbyLocale_zh_TW</artifactId>
+ <version>${derby.version}</version>
<scope>runtime</scope>
</dependency>
-
- <!-- database dependencies -->
<dependency>
<groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
+ <artifactId>derbyLocale_zh_CN</artifactId>
+ <version>${derby.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbyLocale_pt_BR</artifactId>
+ <version>${derby.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbyLocale_fr</artifactId>
+ <version>${derby.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbyLocale_ru</artifactId>
+ <version>${derby.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbyLocale_ko_KR</artifactId>
+ <version>${derby.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbyLocale_hu</artifactId>
+ <version>${derby.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbyLocale_pl</artifactId>
<version>${derby.version}</version>
<scope>runtime</scope>
</dependency>
Modified: manifoldcf/branches/release-1.6-branch/framework/authority-service/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.6-branch/framework/authority-service/pom.xml?rev=1597627&r1=1597626&r2=1597627&view=diff
==============================================================================
--- manifoldcf/branches/release-1.6-branch/framework/authority-service/pom.xml (original)
+++ manifoldcf/branches/release-1.6-branch/framework/authority-service/pom.xml Mon May 26 18:47:32 2014
@@ -61,76 +61,106 @@
<!-- runtime dependencies -->
<dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>${commons-io.version}</version>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>${slf4j.version}</version>
<scope>runtime</scope>
</dependency>
+
+ <!-- database dependencies -->
<dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>${commons-codec.version}</version>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>${derby.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>commons-el</groupId>
- <artifactId>commons-el</artifactId>
- <version>${commons-el.version}</version>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbytools</artifactId>
+ <version>${derby.version}</version>
<scope>runtime</scope>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>${httpcomponent.httpclient.version}</version>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbynet</artifactId>
+ <version>${derby.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>${commons-collections.version}</version>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbyLocale_it</artifactId>
+ <version>${derby.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- <version>${commons-fileupload.version}</version>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbyLocale_de_DE</artifactId>
+ <version>${derby.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>xalan</groupId>
- <artifactId>serializer</artifactId>
- <version>${xalan.version}</version>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbyLocale_es</artifactId>
+ <version>${derby.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>${xerces.version}</version>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbyLocale_ja_JP</artifactId>
+ <version>${derby.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- <version>${xml-apis.version}</version>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbyLocale_cs</artifactId>
+ <version>${derby.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>${commons-logging.version}</version>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbyLocale_zh_TW</artifactId>
+ <version>${derby.version}</version>
<scope>runtime</scope>
</dependency>
-
- <!-- database dependencies -->
<dependency>
<groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
+ <artifactId>derbyLocale_zh_CN</artifactId>
+ <version>${derby.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbyLocale_pt_BR</artifactId>
+ <version>${derby.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbyLocale_fr</artifactId>
+ <version>${derby.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbyLocale_ru</artifactId>
+ <version>${derby.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbyLocale_ko_KR</artifactId>
+ <version>${derby.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbyLocale_hu</artifactId>
+ <version>${derby.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbyLocale_pl</artifactId>
<version>${derby.version}</version>
<scope>runtime</scope>
</dependency>
Modified: manifoldcf/branches/release-1.6-branch/framework/combined-service/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.6-branch/framework/combined-service/pom.xml?rev=1597627&r1=1597626&r2=1597627&view=diff
==============================================================================
--- manifoldcf/branches/release-1.6-branch/framework/combined-service/pom.xml (original)
+++ manifoldcf/branches/release-1.6-branch/framework/combined-service/pom.xml Mon May 26 18:47:32 2014
@@ -84,76 +84,106 @@
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>${commons-io.version}</version>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>${slf4j.version}</version>
<scope>runtime</scope>
</dependency>
+
+ <!-- database dependencies -->
<dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>${commons-codec.version}</version>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>${derby.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>commons-el</groupId>
- <artifactId>commons-el</artifactId>
- <version>${commons-el.version}</version>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbytools</artifactId>
+ <version>${derby.version}</version>
<scope>runtime</scope>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>${httpcomponent.httpclient.version}</version>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbynet</artifactId>
+ <version>${derby.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>${commons-collections.version}</version>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbyLocale_it</artifactId>
+ <version>${derby.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- <version>${commons-fileupload.version}</version>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbyLocale_de_DE</artifactId>
+ <version>${derby.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>xalan</groupId>
- <artifactId>serializer</artifactId>
- <version>${xalan.version}</version>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbyLocale_es</artifactId>
+ <version>${derby.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>${xerces.version}</version>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbyLocale_ja_JP</artifactId>
+ <version>${derby.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- <version>${xml-apis.version}</version>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbyLocale_cs</artifactId>
+ <version>${derby.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>${commons-logging.version}</version>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbyLocale_zh_TW</artifactId>
+ <version>${derby.version}</version>
<scope>runtime</scope>
</dependency>
-
- <!-- database dependencies -->
<dependency>
<groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
+ <artifactId>derbyLocale_zh_CN</artifactId>
+ <version>${derby.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbyLocale_pt_BR</artifactId>
+ <version>${derby.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbyLocale_fr</artifactId>
+ <version>${derby.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbyLocale_ru</artifactId>
+ <version>${derby.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbyLocale_ko_KR</artifactId>
+ <version>${derby.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbyLocale_hu</artifactId>
+ <version>${derby.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbyLocale_pl</artifactId>
<version>${derby.version}</version>
<scope>runtime</scope>
</dependency>
Modified: manifoldcf/branches/release-1.6-branch/framework/core/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.6-branch/framework/core/pom.xml?rev=1597627&r1=1597626&r2=1597627&view=diff
==============================================================================
--- manifoldcf/branches/release-1.6-branch/framework/core/pom.xml (original)
+++ manifoldcf/branches/release-1.6-branch/framework/core/pom.xml Mon May 26 18:47:32 2014
@@ -61,12 +61,6 @@
<version>${httpcomponent.httpclient.version}</version>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>${servlet-api.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>${log4j.version}</version>
@@ -77,33 +71,170 @@
<version>${json.version}</version>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
<version>${velocity.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>oro</groupId>
+ <artifactId>oro</artifactId>
+ </exclusion>
+ </exclusions>
+
</dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
<version>${zookeeper.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jline</groupId>
+ <artifactId>jline</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.netty</groupId>
+ <artifactId>netty</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ <version>${activation.version}</version>
</dependency>
<dependency>
<groupId>org.apache.axis</groupId>
<artifactId>axis</artifactId>
- <version>1.4</version>
+ <version>${axis.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis</groupId>
+ <artifactId>axis-jaxrpc</artifactId>
+ <version>${axis.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.castor</groupId>
+ <artifactId>castor</artifactId>
+ <version>${castor.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>adaptx</groupId>
+ <artifactId>adaptx</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xerces</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>ldapsdk</groupId>
+ <artifactId>ldapsdk</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.cenqua.clover</groupId>
+ <artifactId>clover</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>cglib</groupId>
+ <artifactId>cglib-full</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>oro</groupId>
+ <artifactId>oro</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jakarta-regexp</groupId>
+ <artifactId>jakarta-regexp</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>wsdl4j</groupId>
<artifactId>wsdl4j</artifactId>
- <version>1.6.2</version>
+ <version>${wsdl4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ <version>${mail.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-discovery</groupId>
+ <artifactId>commons-discovery</artifactId>
+ <version>${commons-discovery.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-el</groupId>
+ <artifactId>commons-el</artifactId>
+ <version>${commons-el.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>xalan</groupId>
+ <artifactId>serializer</artifactId>
+ <version>${xalan.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>${xerces.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ <version>${xml-apis.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>${servlet-api.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>${postgresql.version}</version>
@@ -121,5 +252,12 @@
<version>${derby.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>${slf4j.version}</version>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
</project>
Modified: manifoldcf/branches/release-1.6-branch/framework/crawler-ui/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.6-branch/framework/crawler-ui/pom.xml?rev=1597627&r1=1597626&r2=1597627&view=diff
==============================================================================
--- manifoldcf/branches/release-1.6-branch/framework/crawler-ui/pom.xml (original)
+++ manifoldcf/branches/release-1.6-branch/framework/crawler-ui/pom.xml Mon May 26 18:47:32 2014
@@ -67,76 +67,124 @@
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>${commons-io.version}</version>
+ <groupId>xalan</groupId>
+ <artifactId>serializer</artifactId>
+ <version>${xalan.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>${commons-codec.version}</version>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>${xerces.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>commons-el</groupId>
- <artifactId>commons-el</artifactId>
- <version>${commons-el.version}</version>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ <version>${xml-apis.version}</version>
<scope>runtime</scope>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>${httpcomponent.httpclient.version}</version>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>${slf4j.version}</version>
<scope>runtime</scope>
</dependency>
+
+ <!-- database dependencies -->
<dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>${commons-collections.version}</version>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>${derby.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- <version>${commons-fileupload.version}</version>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbytools</artifactId>
+ <version>${derby.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>xalan</groupId>
- <artifactId>serializer</artifactId>
- <version>${xalan.version}</version>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbynet</artifactId>
+ <version>${derby.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>${xerces.version}</version>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbyLocale_it</artifactId>
+ <version>${derby.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- <version>${xml-apis.version}</version>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbyLocale_de_DE</artifactId>
+ <version>${derby.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>${commons-logging.version}</version>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbyLocale_es</artifactId>
+ <version>${derby.version}</version>
<scope>runtime</scope>
</dependency>
-
- <!-- database dependencies -->
<dependency>
<groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
+ <artifactId>derbyLocale_ja_JP</artifactId>
+ <version>${derby.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbyLocale_cs</artifactId>
+ <version>${derby.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbyLocale_zh_TW</artifactId>
+ <version>${derby.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbyLocale_zh_CN</artifactId>
+ <version>${derby.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbyLocale_pt_BR</artifactId>
+ <version>${derby.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbyLocale_fr</artifactId>
+ <version>${derby.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbyLocale_ru</artifactId>
+ <version>${derby.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbyLocale_ko_KR</artifactId>
+ <version>${derby.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbyLocale_hu</artifactId>
+ <version>${derby.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbyLocale_pl</artifactId>
<version>${derby.version}</version>
<scope>runtime</scope>
</dependency>
Modified: manifoldcf/branches/release-1.6-branch/framework/pull-agent/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.6-branch/framework/pull-agent/pom.xml?rev=1597627&r1=1597626&r2=1597627&view=diff
==============================================================================
--- manifoldcf/branches/release-1.6-branch/framework/pull-agent/pom.xml (original)
+++ manifoldcf/branches/release-1.6-branch/framework/pull-agent/pom.xml Mon May 26 18:47:32 2014
@@ -75,62 +75,73 @@
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
-
+
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jsp-api-2.1-glassfish</artifactId>
+ <version>${glassfish.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jsp-2.1-glassfish</artifactId>
+ <version>${glassfish.version}</version>
+ <scope>test</scope>
+ </dependency>
+
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
<version>${jetty.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
<version>${jetty.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
<version>${jetty.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
<version>${jetty.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-http</artifactId>
<version>${jetty.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-io</artifactId>
<version>${jetty.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-security</artifactId>
<version>${jetty.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-continuation</artifactId>
<version>${jetty.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-xml</artifactId>
<version>${jetty.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jsp-api-2.1-glassfish</artifactId>
- <version>${glassfish.version}</version>
- </dependency>
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jsp-2.1-glassfish</artifactId>
- <version>${glassfish.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
Modified: manifoldcf/branches/release-1.6-branch/framework/ui-core/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.6-branch/framework/ui-core/pom.xml?rev=1597627&r1=1597626&r2=1597627&view=diff
==============================================================================
--- manifoldcf/branches/release-1.6-branch/framework/ui-core/pom.xml (original)
+++ manifoldcf/branches/release-1.6-branch/framework/ui-core/pom.xml Mon May 26 18:47:32 2014
@@ -68,20 +68,6 @@
<version>${project.version}</version>
</dependency>
- <!-- web dependencies -->
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>${servlet-api.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jsp-api-2.1-glassfish</artifactId>
- <version>${glassfish.version}</version>
- <scope>provided</scope>
- </dependency>
-
<!-- other dependencies -->
<dependency>
<groupId>commons-lang</groupId>
Modified: manifoldcf/branches/release-1.6-branch/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.6-branch/pom.xml?rev=1597627&r1=1597626&r2=1597627&view=diff
==============================================================================
--- manifoldcf/branches/release-1.6-branch/pom.xml (original)
+++ manifoldcf/branches/release-1.6-branch/pom.xml Mon May 26 18:47:32 2014
@@ -43,11 +43,17 @@
<hsqldb.version>2.3.1</hsqldb.version>
<derby.version>10.10.1.1</derby.version>
<jetty.version>7.5.4.v20111024</jetty.version>
+ <mail.version>1.4.5</mail.version>
+ <activation.version>1.1.1</activation.version>
+ <axis.version>1.4</axis.version>
+ <wsdl4j.version>1.6.2</wsdl4j.version>
+ <castor.version>1.0.5</castor.version>
<commons-codec.version>1.5</commons-codec.version>
<commons-io.version>2.1</commons-io.version>
<commons-logging.version>1.1.3</commons-logging.version>
<commons-collections.version>3.2.1</commons-collections.version>
<commons-fileupload.version>1.2.2</commons-fileupload.version>
+ <commons-discovery.version>0.5</commons-discovery.version>
<httpcomponent.httpclient.version>4.3.3</httpcomponent.httpclient.version>
<httpcomponent.httpcore.version>4.3.2</httpcomponent.httpcore.version>
<httpcomponent.httpmime.version>4.3.3</httpcomponent.httpmime.version>