Author: kwright
Date: Wed Sep 24 15:18:02 2014
New Revision: 1627345
URL: http://svn.apache.org/r1627345
Log:
Fix for CONNECTORS-1044. Remove derby as a testing database, in favor of HSQLDB
Added:
manifoldcf/trunk/connectors/activedirectory/connector/src/test/java/org/apache/manifoldcf/authorities/authorities/activedirectory/tests/BaseUIHSQLDB.java
- copied unchanged from r1627342,
manifoldcf/branches/CONNECTORS-1044/connectors/activedirectory/connector/src/test/java/org/apache/manifoldcf/authorities/authorities/activedirectory/tests/BaseUIHSQLDB.java
manifoldcf/trunk/connectors/activedirectory/connector/src/test/java/org/apache/manifoldcf/authorities/authorities/activedirectory/tests/NavigationHSQLDBUI.java
- copied unchanged from r1627342,
manifoldcf/branches/CONNECTORS-1044/connectors/activedirectory/connector/src/test/java/org/apache/manifoldcf/authorities/authorities/activedirectory/tests/NavigationHSQLDBUI.java
manifoldcf/trunk/connectors/alfresco/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfresco/tests/APISanityHSQLDBIT.java
- copied unchanged from r1627342,
manifoldcf/branches/CONNECTORS-1044/connectors/alfresco/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfresco/tests/APISanityHSQLDBIT.java
manifoldcf/trunk/connectors/alfresco/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfresco/tests/BaseITHSQLDB.java
- copied unchanged from r1627342,
manifoldcf/branches/CONNECTORS-1044/connectors/alfresco/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfresco/tests/BaseITHSQLDB.java
manifoldcf/trunk/connectors/alfresco/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfresco/tests/BaseUIHSQLDB.java
- copied unchanged from r1627342,
manifoldcf/branches/CONNECTORS-1044/connectors/alfresco/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfresco/tests/BaseUIHSQLDB.java
manifoldcf/trunk/connectors/alfresco/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfresco/tests/NavigationHSQLDBUI.java
- copied unchanged from r1627342,
manifoldcf/branches/CONNECTORS-1044/connectors/alfresco/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfresco/tests/NavigationHSQLDBUI.java
manifoldcf/trunk/connectors/cmis/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/cmis/tests/APISanityHSQLDBIT.java
- copied unchanged from r1627342,
manifoldcf/branches/CONNECTORS-1044/connectors/cmis/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/cmis/tests/APISanityHSQLDBIT.java
manifoldcf/trunk/connectors/cmis/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/cmis/tests/BaseITHSQLDB.java
- copied unchanged from r1627342,
manifoldcf/branches/CONNECTORS-1044/connectors/cmis/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/cmis/tests/BaseITHSQLDB.java
manifoldcf/trunk/connectors/cmis/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/cmis/tests/BaseUIHSQLDB.java
- copied unchanged from r1627342,
manifoldcf/branches/CONNECTORS-1044/connectors/cmis/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/cmis/tests/BaseUIHSQLDB.java
manifoldcf/trunk/connectors/cmis/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/cmis/tests/NavigationHSQLDBUI.java
- copied unchanged from r1627342,
manifoldcf/branches/CONNECTORS-1044/connectors/cmis/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/cmis/tests/NavigationHSQLDBUI.java
manifoldcf/trunk/connectors/elasticsearch/connector/src/test/java/org/apache/manifoldcf/agents/output/elasticsearch/tests/APISanityHSQLDBIT.java
- copied unchanged from r1627342,
manifoldcf/branches/CONNECTORS-1044/connectors/elasticsearch/connector/src/test/java/org/apache/manifoldcf/agents/output/elasticsearch/tests/APISanityHSQLDBIT.java
manifoldcf/trunk/connectors/elasticsearch/connector/src/test/java/org/apache/manifoldcf/agents/output/elasticsearch/tests/BaseITHSQLDB.java
- copied unchanged from r1627342,
manifoldcf/branches/CONNECTORS-1044/connectors/elasticsearch/connector/src/test/java/org/apache/manifoldcf/agents/output/elasticsearch/tests/BaseITHSQLDB.java
manifoldcf/trunk/connectors/elasticsearch/connector/src/test/java/org/apache/manifoldcf/agents/output/elasticsearch/tests/BaseUIHSQLDB.java
- copied unchanged from r1627342,
manifoldcf/branches/CONNECTORS-1044/connectors/elasticsearch/connector/src/test/java/org/apache/manifoldcf/agents/output/elasticsearch/tests/BaseUIHSQLDB.java
manifoldcf/trunk/connectors/elasticsearch/connector/src/test/java/org/apache/manifoldcf/agents/output/elasticsearch/tests/NavigationHSQLDBUI.java
- copied unchanged from r1627342,
manifoldcf/branches/CONNECTORS-1044/connectors/elasticsearch/connector/src/test/java/org/apache/manifoldcf/agents/output/elasticsearch/tests/NavigationHSQLDBUI.java
manifoldcf/trunk/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/NavigationHSQLDBUI.java
- copied unchanged from r1627342,
manifoldcf/branches/CONNECTORS-1044/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/NavigationHSQLDBUI.java
manifoldcf/trunk/connectors/gts/connector/src/test/java/org/apache/manifoldcf/agents/output/gts/tests/BaseUIHSQLDB.java
- copied unchanged from r1627342,
manifoldcf/branches/CONNECTORS-1044/connectors/gts/connector/src/test/java/org/apache/manifoldcf/agents/output/gts/tests/BaseUIHSQLDB.java
manifoldcf/trunk/connectors/gts/connector/src/test/java/org/apache/manifoldcf/agents/output/gts/tests/NavigationHSQLDBUI.java
- copied unchanged from r1627342,
manifoldcf/branches/CONNECTORS-1044/connectors/gts/connector/src/test/java/org/apache/manifoldcf/agents/output/gts/tests/NavigationHSQLDBUI.java
manifoldcf/trunk/connectors/hdfs/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/hdfs/tests/BaseUIHSQLDB.java
- copied unchanged from r1627342,
manifoldcf/branches/CONNECTORS-1044/connectors/hdfs/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/hdfs/tests/BaseUIHSQLDB.java
manifoldcf/trunk/connectors/hdfs/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/hdfs/tests/NavigationHSQLDBUI.java
- copied unchanged from r1627342,
manifoldcf/branches/CONNECTORS-1044/connectors/hdfs/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/hdfs/tests/NavigationHSQLDBUI.java
manifoldcf/trunk/connectors/jcifs/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/sharedrive/tests/BaseUIHSQLDB.java
- copied unchanged from r1627342,
manifoldcf/branches/CONNECTORS-1044/connectors/jcifs/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/sharedrive/tests/BaseUIHSQLDB.java
manifoldcf/trunk/connectors/jcifs/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/sharedrive/tests/NavigationHSQLDBUI.java
- copied unchanged from r1627342,
manifoldcf/branches/CONNECTORS-1044/connectors/jcifs/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/sharedrive/tests/NavigationHSQLDBUI.java
manifoldcf/trunk/connectors/jdbc/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/jdbc/tests/BaseUIHSQLDB.java
- copied unchanged from r1627342,
manifoldcf/branches/CONNECTORS-1044/connectors/jdbc/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/jdbc/tests/BaseUIHSQLDB.java
manifoldcf/trunk/connectors/jdbc/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/jdbc/tests/NavigationHSQLDBUI.java
- copied unchanged from r1627342,
manifoldcf/branches/CONNECTORS-1044/connectors/jdbc/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/jdbc/tests/NavigationHSQLDBUI.java
manifoldcf/trunk/connectors/ldap/connector/src/test/java/org/apache/manifoldcf/authorities/authorities/ldap/tests/BaseUIHSQLDB.java
- copied unchanged from r1627342,
manifoldcf/branches/CONNECTORS-1044/connectors/ldap/connector/src/test/java/org/apache/manifoldcf/authorities/authorities/ldap/tests/BaseUIHSQLDB.java
manifoldcf/trunk/connectors/ldap/connector/src/test/java/org/apache/manifoldcf/authorities/authorities/ldap/tests/NavigationHSQLDBUI.java
- copied unchanged from r1627342,
manifoldcf/branches/CONNECTORS-1044/connectors/ldap/connector/src/test/java/org/apache/manifoldcf/authorities/authorities/ldap/tests/NavigationHSQLDBUI.java
manifoldcf/trunk/connectors/nullauthority/connector/src/test/java/org/apache/manifoldcf/authorities/authorities/nullauthority/tests/BaseUIHSQLDB.java
- copied unchanged from r1627342,
manifoldcf/branches/CONNECTORS-1044/connectors/nullauthority/connector/src/test/java/org/apache/manifoldcf/authorities/authorities/nullauthority/tests/BaseUIHSQLDB.java
manifoldcf/trunk/connectors/nullauthority/connector/src/test/java/org/apache/manifoldcf/authorities/authorities/nullauthority/tests/NavigationHSQLDBUI.java
- copied unchanged from r1627342,
manifoldcf/branches/CONNECTORS-1044/connectors/nullauthority/connector/src/test/java/org/apache/manifoldcf/authorities/authorities/nullauthority/tests/NavigationHSQLDBUI.java
manifoldcf/trunk/connectors/opensearchserver/connector/src/test/java/org/apache/manifoldcf/agents/output/opensearchserver/tests/BaseUIHSQLDB.java
- copied unchanged from r1627342,
manifoldcf/branches/CONNECTORS-1044/connectors/opensearchserver/connector/src/test/java/org/apache/manifoldcf/agents/output/opensearchserver/tests/BaseUIHSQLDB.java
manifoldcf/trunk/connectors/opensearchserver/connector/src/test/java/org/apache/manifoldcf/agents/output/opensearchserver/tests/NavigationHSQLDBUI.java
- copied unchanged from r1627342,
manifoldcf/branches/CONNECTORS-1044/connectors/opensearchserver/connector/src/test/java/org/apache/manifoldcf/agents/output/opensearchserver/tests/NavigationHSQLDBUI.java
manifoldcf/trunk/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/BaseUIHSQLDB.java
- copied unchanged from r1627342,
manifoldcf/branches/CONNECTORS-1044/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/BaseUIHSQLDB.java
manifoldcf/trunk/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/FlakyHSQLDBInstance.java
- copied unchanged from r1627342,
manifoldcf/branches/CONNECTORS-1044/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/FlakyHSQLDBInstance.java
manifoldcf/trunk/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/NavigationHSQLDBUI.java
- copied unchanged from r1627342,
manifoldcf/branches/CONNECTORS-1044/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/NavigationHSQLDBUI.java
manifoldcf/trunk/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/RSSFlakyHSQLDBIT.java
- copied unchanged from r1627342,
manifoldcf/branches/CONNECTORS-1044/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/RSSFlakyHSQLDBIT.java
manifoldcf/trunk/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/BaseITHSQLDB.java
- copied unchanged from r1627342,
manifoldcf/branches/CONNECTORS-1044/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/BaseITHSQLDB.java
manifoldcf/trunk/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/BaseUIHSQLDB.java
- copied unchanged from r1627342,
manifoldcf/branches/CONNECTORS-1044/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/BaseUIHSQLDB.java
manifoldcf/trunk/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/NavigationHSQLDBUI.java
- copied unchanged from r1627342,
manifoldcf/branches/CONNECTORS-1044/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/NavigationHSQLDBUI.java
manifoldcf/trunk/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/SolrCrawlHSQLDBIT.java
- copied unchanged from r1627342,
manifoldcf/branches/CONNECTORS-1044/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/SolrCrawlHSQLDBIT.java
manifoldcf/trunk/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/BaseITHSQLDB.java
- copied unchanged from r1627342,
manifoldcf/branches/CONNECTORS-1044/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/BaseITHSQLDB.java
manifoldcf/trunk/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/BaseUIHSQLDB.java
- copied unchanged from r1627342,
manifoldcf/branches/CONNECTORS-1044/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/BaseUIHSQLDB.java
manifoldcf/trunk/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/NavigationHSQLDBUI.java
- copied unchanged from r1627342,
manifoldcf/branches/CONNECTORS-1044/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/NavigationHSQLDBUI.java
manifoldcf/trunk/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/SessionLoginHSQLDBIT.java
- copied unchanged from r1627342,
manifoldcf/branches/CONNECTORS-1044/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/SessionLoginHSQLDBIT.java
manifoldcf/trunk/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/ThrottlingHSQLDBLT.java
- copied unchanged from r1627342,
manifoldcf/branches/CONNECTORS-1044/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/ThrottlingHSQLDBLT.java
manifoldcf/trunk/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/BaseITHSQLDB.java
- copied unchanged from r1627342,
manifoldcf/branches/CONNECTORS-1044/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/BaseITHSQLDB.java
manifoldcf/trunk/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/BaseUIHSQLDB.java
- copied unchanged from r1627342,
manifoldcf/branches/CONNECTORS-1044/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/BaseUIHSQLDB.java
manifoldcf/trunk/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/NavigationHSQLDBUI.java
- copied unchanged from r1627342,
manifoldcf/branches/CONNECTORS-1044/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/NavigationHSQLDBUI.java
manifoldcf/trunk/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/SanityHSQLDBIT.java
- copied unchanged from r1627342,
manifoldcf/branches/CONNECTORS-1044/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/SanityHSQLDBIT.java
Removed:
manifoldcf/trunk/connectors/activedirectory/connector/src/test/java/org/apache/manifoldcf/authorities/authorities/activedirectory/tests/BaseUIDerby.java
manifoldcf/trunk/connectors/activedirectory/connector/src/test/java/org/apache/manifoldcf/authorities/authorities/activedirectory/tests/NavigationDerbyUI.java
manifoldcf/trunk/connectors/alfresco/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfresco/tests/APISanityDerbyIT.java
manifoldcf/trunk/connectors/alfresco/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfresco/tests/BaseDerby.java
manifoldcf/trunk/connectors/alfresco/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfresco/tests/BaseITDerby.java
manifoldcf/trunk/connectors/alfresco/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfresco/tests/BaseUIDerby.java
manifoldcf/trunk/connectors/alfresco/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfresco/tests/NavigationDerbyUI.java
manifoldcf/trunk/connectors/alfresco/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfresco/tests/SanityDerbyTest.java
manifoldcf/trunk/connectors/cmis/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/cmis/tests/APISanityDerbyIT.java
manifoldcf/trunk/connectors/cmis/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/cmis/tests/BaseDerby.java
manifoldcf/trunk/connectors/cmis/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/cmis/tests/BaseITDerby.java
manifoldcf/trunk/connectors/cmis/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/cmis/tests/BaseUIDerby.java
manifoldcf/trunk/connectors/cmis/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/cmis/tests/NavigationDerbyUI.java
manifoldcf/trunk/connectors/cmis/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/cmis/tests/SanityDerbyTest.java
manifoldcf/trunk/connectors/elasticsearch/connector/src/test/java/org/apache/manifoldcf/agents/output/elasticsearch/tests/APISanityDerbyIT.java
manifoldcf/trunk/connectors/elasticsearch/connector/src/test/java/org/apache/manifoldcf/agents/output/elasticsearch/tests/BaseDerby.java
manifoldcf/trunk/connectors/elasticsearch/connector/src/test/java/org/apache/manifoldcf/agents/output/elasticsearch/tests/BaseITDerby.java
manifoldcf/trunk/connectors/elasticsearch/connector/src/test/java/org/apache/manifoldcf/agents/output/elasticsearch/tests/BaseUIDerby.java
manifoldcf/trunk/connectors/elasticsearch/connector/src/test/java/org/apache/manifoldcf/agents/output/elasticsearch/tests/NavigationDerbyUI.java
manifoldcf/trunk/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/agents/output/filesystem/BaseDerby.java
manifoldcf/trunk/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/agents/output/filesystem/SanityDerbyTest.java
manifoldcf/trunk/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/APISanityDerbyIT.java
manifoldcf/trunk/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/BaseDerby.java
manifoldcf/trunk/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/BaseITDerby.java
manifoldcf/trunk/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/BaseUIDerby.java
manifoldcf/trunk/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/BigCrawlDerbyLT.java
manifoldcf/trunk/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/ExpirationDerbyIT.java
manifoldcf/trunk/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/HopcountDerbyIT.java
manifoldcf/trunk/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/NavigationDerbyUI.java
manifoldcf/trunk/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/SanityDerbyIT.java
manifoldcf/trunk/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/SanityDerbyTest.java
manifoldcf/trunk/connectors/gridfs/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/gridfs/tests/BaseDerby.java
manifoldcf/trunk/connectors/gridfs/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/gridfs/tests/SanityDerbyTest.java
manifoldcf/trunk/connectors/gts/connector/src/test/java/org/apache/manifoldcf/agents/output/gts/tests/BaseUIDerby.java
manifoldcf/trunk/connectors/gts/connector/src/test/java/org/apache/manifoldcf/agents/output/gts/tests/NavigationDerbyUI.java
manifoldcf/trunk/connectors/hdfs/connector/src/test/java/org/apache/manifoldcf/agents/output/hdfs/BaseDerby.java
manifoldcf/trunk/connectors/hdfs/connector/src/test/java/org/apache/manifoldcf/agents/output/hdfs/SanityDerbyTest.java
manifoldcf/trunk/connectors/hdfs/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/hdfs/tests/BaseDerby.java
manifoldcf/trunk/connectors/hdfs/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/hdfs/tests/BaseUIDerby.java
manifoldcf/trunk/connectors/hdfs/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/hdfs/tests/NavigationDerbyUI.java
manifoldcf/trunk/connectors/hdfs/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/hdfs/tests/SanityDerbyTest.java
manifoldcf/trunk/connectors/jcifs/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/sharedrive/tests/BaseUIDerby.java
manifoldcf/trunk/connectors/jcifs/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/sharedrive/tests/NavigationDerbyUI.java
manifoldcf/trunk/connectors/jdbc/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/jdbc/tests/BaseUIDerby.java
manifoldcf/trunk/connectors/jdbc/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/jdbc/tests/NavigationDerbyUI.java
manifoldcf/trunk/connectors/ldap/connector/src/test/java/org/apache/manifoldcf/authorities/authorities/ldap/tests/BaseUIDerby.java
manifoldcf/trunk/connectors/ldap/connector/src/test/java/org/apache/manifoldcf/authorities/authorities/ldap/tests/NavigationDerbyUI.java
manifoldcf/trunk/connectors/nullauthority/connector/src/test/java/org/apache/manifoldcf/authorities/authorities/nullauthority/tests/BaseUIDerby.java
manifoldcf/trunk/connectors/nullauthority/connector/src/test/java/org/apache/manifoldcf/authorities/authorities/nullauthority/tests/NavigationDerbyUI.java
manifoldcf/trunk/connectors/opensearchserver/connector/src/test/java/org/apache/manifoldcf/agents/output/opensearchserver/tests/BaseUIDerby.java
manifoldcf/trunk/connectors/opensearchserver/connector/src/test/java/org/apache/manifoldcf/agents/output/opensearchserver/tests/NavigationDerbyUI.java
manifoldcf/trunk/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/BaseITDerby.java
manifoldcf/trunk/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/BaseUIDerby.java
manifoldcf/trunk/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/BigCrawlDerbyLT.java
manifoldcf/trunk/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/FlakyDerbyInstance.java
manifoldcf/trunk/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/NavigationDerbyUI.java
manifoldcf/trunk/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/RSSFlakyDerbyIT.java
manifoldcf/trunk/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/RSSSimpleCrawlDerbyIT.java
manifoldcf/trunk/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/BaseITDerby.java
manifoldcf/trunk/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/BaseUIDerby.java
manifoldcf/trunk/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/NavigationDerbyUI.java
manifoldcf/trunk/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/SolrCrawlDerbyIT.java
manifoldcf/trunk/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/BaseITDerby.java
manifoldcf/trunk/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/BaseUIDerby.java
manifoldcf/trunk/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/NavigationDerbyUI.java
manifoldcf/trunk/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/SessionLoginDerbyIT.java
manifoldcf/trunk/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/ThrottlingDerbyLT.java
manifoldcf/trunk/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/BaseDerby.java
manifoldcf/trunk/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/BaseITDerby.java
manifoldcf/trunk/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/BaseUIDerby.java
manifoldcf/trunk/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/NavigationDerbyUI.java
manifoldcf/trunk/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/SanityDerbyIT.java
manifoldcf/trunk/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/SanityDerbyTest.java
manifoldcf/trunk/framework/agents/src/test/java/org/apache/manifoldcf/agents/tests/BaseDerby.java
manifoldcf/trunk/framework/agents/src/test/java/org/apache/manifoldcf/agents/tests/SanityDerbyTest.java
manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfaceDerby.java
manifoldcf/trunk/framework/core/src/test/java/org/apache/manifoldcf/core/tests/BaseDerby.java
manifoldcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/BaseDerby.java
manifoldcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/BaseITDerby.java
manifoldcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/ConnectorBaseDerby.java
manifoldcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/ConnectorBaseUIDerby.java
manifoldcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/SanityDerbyTest.java
Modified:
manifoldcf/trunk/ (props changed)
manifoldcf/trunk/CHANGES.txt
manifoldcf/trunk/build.xml
manifoldcf/trunk/connectors/activedirectory/pom.xml
manifoldcf/trunk/connectors/alfresco/build.xml
manifoldcf/trunk/connectors/alfresco/pom.xml
manifoldcf/trunk/connectors/amazoncloudsearch/pom.xml
manifoldcf/trunk/connectors/cmis/pom.xml
manifoldcf/trunk/connectors/documentfilter/pom.xml
manifoldcf/trunk/connectors/dropbox/pom.xml
manifoldcf/trunk/connectors/elasticsearch/pom.xml
manifoldcf/trunk/connectors/filesystem/pom.xml
manifoldcf/trunk/connectors/forcedmetadata/pom.xml
manifoldcf/trunk/connectors/generic/pom.xml
manifoldcf/trunk/connectors/googledrive/pom.xml
manifoldcf/trunk/connectors/gridfs/pom.xml
manifoldcf/trunk/connectors/gts/pom.xml
manifoldcf/trunk/connectors/hdfs/pom.xml
manifoldcf/trunk/connectors/jcifs/pom.xml
manifoldcf/trunk/connectors/jdbc/pom.xml
manifoldcf/trunk/connectors/jira/pom.xml
manifoldcf/trunk/connectors/ldap/pom.xml
manifoldcf/trunk/connectors/nullauthority/pom.xml
manifoldcf/trunk/connectors/nulloutput/pom.xml
manifoldcf/trunk/connectors/nulltransformation/pom.xml
manifoldcf/trunk/connectors/opensearchserver/pom.xml
manifoldcf/trunk/connectors/regexpmapper/pom.xml
manifoldcf/trunk/connectors/rss/ (props changed)
manifoldcf/trunk/connectors/rss/pom.xml
manifoldcf/trunk/connectors/sharepoint/ (props changed)
manifoldcf/trunk/connectors/sharepoint/pom.xml
manifoldcf/trunk/connectors/solr/pom.xml
manifoldcf/trunk/connectors/tika/pom.xml
manifoldcf/trunk/connectors/webcrawler/pom.xml
manifoldcf/trunk/connectors/wiki/ (props changed)
manifoldcf/trunk/connectors/wiki/pom.xml
manifoldcf/trunk/framework/agents/pom.xml
manifoldcf/trunk/framework/api-service/pom.xml
manifoldcf/trunk/framework/authority-service/pom.xml
manifoldcf/trunk/framework/build.xml
manifoldcf/trunk/framework/buildfiles/connector-build.xml
manifoldcf/trunk/framework/combined-service/pom.xml
manifoldcf/trunk/framework/core/pom.xml
manifoldcf/trunk/framework/core/src/test/java/org/apache/manifoldcf/core/throttler/TestThrottler.java
manifoldcf/trunk/framework/crawler-ui/pom.xml
manifoldcf/trunk/framework/example-singleprocess/properties.xml
manifoldcf/trunk/framework/pull-agent/pom.xml
manifoldcf/trunk/pom.xml
Propchange: manifoldcf/trunk/
------------------------------------------------------------------------------
Merged /manifoldcf/branches/CONNECTORS-1044:r1627162-1627342
Modified: manifoldcf/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1627345&r1=1627344&r2=1627345&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Wed Sep 24 15:18:02 2014
@@ -3,6 +3,10 @@ $Id$
======================= 2.0-dev =====================
+CONNECTORS-1044: Remove all support for Derby as an internally
+used database.
+(Karl Wright)
+
CONNECTORS-982: Remove all output connector tabs that are
roughly equivalent to what the Document Filter transformation
connector does.
Modified: manifoldcf/trunk/build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/build.xml?rev=1627345&r1=1627344&r2=1627345&view=diff
==============================================================================
--- manifoldcf/trunk/build.xml (original)
+++ manifoldcf/trunk/build.xml Wed Sep 24 15:18:02 2014
@@ -31,14 +31,14 @@
<target name="downloaded-condition">
<!-- Spot check a few of the dependent jars; no point including ALL of
them here... -->
- <available file="lib/derby.jar" property="derby-found"/>
+ <available file="lib/hsqldb.jar" property="hsqldb-found"/>
<available file="lib/jetty-server.jar" property="jetty-found"/>
<available file="lib/httpclient.jar" property="httpclient-found"/>
<available file="lib/xercesImpl.jar" property="xerces-found"/>
<available file="lib/fop.jar" property="fop-found"/>
<condition property="downloaded">
<and>
- <isset property="derby-found"/>
+ <isset property="hsqldb-found"/>
<isset property="jetty-found"/>
<isset property="httpclient-found"/>
<isset property="xerces-found"/>
@@ -88,10 +88,6 @@
<ant dir="framework" target="run-tests"/>
</target>
- <target name="run-tests-derby-framework" depends="setup-framework"
if="downloaded">
- <ant dir="framework" target="run-tests-derby"/>
- </target>
-
<target name="run-tests-postgresql-framework" depends="setup-framework"
if="downloaded">
<ant dir="framework" target="run-tests-postgresql"/>
</target>
@@ -269,10 +265,6 @@
<connectors-crawl target="run-tests"/>
</target>
- <target name="run-connectors-tests-derby" depends="deliver-framework"
if="downloaded">
- <connectors-crawl target="run-tests-derby"/>
- </target>
-
<target name="run-connectors-tests-HSQLDB" depends="deliver-framework"
if="downloaded">
<connectors-crawl target="run-tests-HSQLDB"/>
</target>
@@ -289,10 +281,6 @@
<connectors-crawl target="run-tests-mysql"/>
</target>
- <target name="run-connectors-IT-derby" depends="deliver-framework"
if="downloaded">
- <connectors-crawl target="run-IT-derby"/>
- </target>
-
<target name="run-connectors-IT-HSQLDB" depends="deliver-framework"
if="downloaded">
<connectors-crawl target="run-IT-HSQLDB"/>
</target>
@@ -309,10 +297,6 @@
<connectors-crawl target="run-IT-mysql"/>
</target>
- <target name="run-connectors-UI-derby" depends="deliver-framework"
if="downloaded">
- <connectors-crawl target="run-UI-derby"/>
- </target>
-
<target name="run-connectors-UI-HSQLDB" depends="deliver-framework"
if="downloaded">
<connectors-crawl target="run-UI-HSQLDB"/>
</target>
@@ -329,10 +313,6 @@
<connectors-crawl target="run-UI-mysql"/>
</target>
- <target name="run-connectors-LT-derby" depends="deliver-framework"
if="downloaded">
- <connectors-crawl target="run-LT-derby"/>
- </target>
-
<target name="run-connectors-LT-HSQLDB" depends="deliver-framework"
if="downloaded">
<connectors-crawl target="run-LT-HSQLDB"/>
</target>
@@ -397,7 +377,6 @@
<exclude name="framework/dist/"/>
<exclude name="**/target/"/>
<exclude name="**/test-output/"/>
- <exclude name="**/test-derby-output/"/>
<exclude name="**/test-postgresql-output/"/>
<exclude name="**/test-HSQLDB-output/"/>
<exclude name="**/test-HSQLDBext-output/"/>
@@ -437,7 +416,6 @@
<exclude name="framework/dist/"/>
<exclude name="**/target/"/>
<exclude name="**/test-output/"/>
- <exclude name="**/test-derby-output/"/>
<exclude name="**/test-postgresql-output/"/>
<exclude name="**/test-HSQLDB-output/"/>
<exclude name="**/test-HSQLDBext-output/"/>
@@ -497,29 +475,25 @@
<target name="image"
depends="create-source-zip,create-source-tar,create-lib-zip,create-lib-tar,create-bin-zip,create-bin-tar"/>
- <target name="test-dr"
depends="run-tests-derby-framework,run-connectors-tests-derby,run-connectors-IT-derby"/>
-
<target name="test-pg"
depends="run-tests-postgresql-framework,run-connectors-tests-postgresql,run-connectors-IT-postgresql"/>
<target name="test-my"
depends="run-tests-mysql-framework,run-connectors-tests-mysql,run-connectors-IT-mysql"/>
<target name="test-hs"
depends="run-tests-HSQLDB-framework,run-tests-HSQLDBext-framework,run-connectors-tests-HSQLDB,run-connectors-tests-HSQLDBext,run-connectors-IT-HSQLDB,run-connectors-IT-HSQLDBext"/>
- <target name="load-dr" depends="run-connectors-LT-derby"/>
-
<target name="load-pg" depends="run-connectors-LT-postgresql"/>
<target name="load-my" depends="run-connectors-LT-mysql"/>
<target name="load-hs"
depends="run-connectors-LT-HSQLDB,run-connectors-LT-HSQLDBext"/>
- <target name="test"
depends="run-tests-framework,run-connectors-tests,test-dr,test-hs"/>
+ <target name="test"
depends="run-tests-framework,run-connectors-tests,test-hs"/>
- <target name="ldtest"
depends="run-connectors-LT-derby,run-connectors-LT-HSQLDB"/>
+ <target name="ldtest" depends="run-connectors-LT-HSQLDB"/>
- <target name="uitest"
depends="run-connectors-UI-derby,run-connectors-UI-HSQLDB"/>
+ <target name="uitest" depends="run-connectors-UI-HSQLDB"/>
- <target name="all" depends="build,javadoc,doc,image,test-dr,test-hs"/>
+ <target name="all" depends="build,javadoc,doc,image,test-hs"/>
<target name="help">
<echo level="info">
@@ -533,21 +507,19 @@ build - Build executable code, jars,
under the 'dist' directory
buildcln - Same as build, but clean up temp files
javadoc - Create the javadocs, under the 'dist/doc' directory
-test - Compile and run all local tests (Derby and HSQLDB)
+test - Compile and run all local tests (HSQLDB)
uitest - Compile and run all UI tests (needs Python)
-ldtest - Compile and run all local load tests (Derby and HSQLDB)
+ldtest - Compile and run all local load tests (HSQLDB)
doc - Build html site, under the 'dist/doc' directory
(requires Apache Forrest)
tmpclean - Clean up temporary files used during build and testing
image - Build release image, under the '.' directory (requires
Apache Forrest)
-test-dr - Compile and run Derby-based tests
test-pg - Compile and run postgresql-based tests (needs
Postgresql)
test-my - Compile and run MySQL-based tests (needs MySQL)
test-hs - Compile and run HSQLDB-based tests
-load-dr - Compile and run Derby-based load tests
load-pg - Compile and run postgresql-based load tests (needs
Postgresql)
load-my - Compile and run MySQL-based load tests (needs MySQL)
@@ -585,7 +557,6 @@ Use Apache Forrest version forrest-0.9-d
<exclude name="**/build/"/>
<exclude name="**/dist/"/>
<exclude name="**/test-output/"/>
- <exclude name="**/test-derby-output/"/>
<exclude name="**/test-postgresql-output/"/>
<exclude name="**/test-HSQLDB-output/"/>
<exclude name="**/test-HSQLDBext-output/"/>
@@ -605,7 +576,6 @@ Use Apache Forrest version forrest-0.9-d
<exclude name="**/build/"/>
<exclude name="**/dist/"/>
<exclude name="**/test-output/"/>
- <exclude name="**/test-derby-output/"/>
<exclude name="**/test-postgresql-output/"/>
<exclude name="**/test-HSQLDB-output/"/>
<exclude name="**/test-HSQLDBext-output/"/>
@@ -698,76 +668,6 @@ Use Apache Forrest version forrest-0.9-d
</antcall>
</target>
- <target name="download-derby">
- <mkdir dir="lib"/>
- <property name="derby-version" value="10.10.2.0"/>
- <property name="derby-package" value="org/apache/derby"/>
- <antcall target="download-via-maven"><param name="project-path"
value="${derby-package}"/><param name="artifact-version"
value="${derby-version}"/><param name="target" value="lib"/>
- <param name="artifact-name" value="derby"/>
- <param name="artifact-type" value="jar"/>
- </antcall>
- <antcall target="download-via-maven"><param name="project-path"
value="${derby-package}"/><param name="artifact-version"
value="${derby-version}"/><param name="target" value="lib"/>
- <param name="artifact-name" value="derbytools"/>
- <param name="artifact-type" value="jar"/>
- </antcall>
- <antcall target="download-via-maven"><param name="project-path"
value="${derby-package}"/><param name="artifact-version"
value="${derby-version}"/><param name="target" value="lib"/>
- <param name="artifact-name" value="derbynet"/>
- <param name="artifact-type" value="jar"/>
- </antcall>
- <antcall target="download-via-maven"><param name="project-path"
value="${derby-package}"/><param name="artifact-version"
value="${derby-version}"/><param name="target" value="lib"/>
- <param name="artifact-name" value="derbyLocale_it"/>
- <param name="artifact-type" value="jar"/>
- </antcall>
- <antcall target="download-via-maven"><param name="project-path"
value="${derby-package}"/><param name="artifact-version"
value="${derby-version}"/><param name="target" value="lib"/>
- <param name="artifact-name" value="derbyLocale_de_DE"/>
- <param name="artifact-type" value="jar"/>
- </antcall>
- <antcall target="download-via-maven"><param name="project-path"
value="${derby-package}"/><param name="artifact-version"
value="${derby-version}"/><param name="target" value="lib"/>
- <param name="artifact-name" value="derbyLocale_es"/>
- <param name="artifact-type" value="jar"/>
- </antcall>
- <antcall target="download-via-maven"><param name="project-path"
value="${derby-package}"/><param name="artifact-version"
value="${derby-version}"/><param name="target" value="lib"/>
- <param name="artifact-name" value="derbyLocale_ja_JP"/>
- <param name="artifact-type" value="jar"/>
- </antcall>
- <antcall target="download-via-maven"><param name="project-path"
value="${derby-package}"/><param name="artifact-version"
value="${derby-version}"/><param name="target" value="lib"/>
- <param name="artifact-name" value="derbyLocale_cs"/>
- <param name="artifact-type" value="jar"/>
- </antcall>
- <antcall target="download-via-maven"><param name="project-path"
value="${derby-package}"/><param name="artifact-version"
value="${derby-version}"/><param name="target" value="lib"/>
- <param name="artifact-name" value="derbyLocale_zh_TW"/>
- <param name="artifact-type" value="jar"/>
- </antcall>
- <antcall target="download-via-maven"><param name="project-path"
value="${derby-package}"/><param name="artifact-version"
value="${derby-version}"/><param name="target" value="lib"/>
- <param name="artifact-name" value="derbyLocale_zh_CN"/>
- <param name="artifact-type" value="jar"/>
- </antcall>
- <antcall target="download-via-maven"><param name="project-path"
value="${derby-package}"/><param name="artifact-version"
value="${derby-version}"/><param name="target" value="lib"/>
- <param name="artifact-name" value="derbyLocale_pt_BR"/>
- <param name="artifact-type" value="jar"/>
- </antcall>
- <antcall target="download-via-maven"><param name="project-path"
value="${derby-package}"/><param name="artifact-version"
value="${derby-version}"/><param name="target" value="lib"/>
- <param name="artifact-name" value="derbyLocale_fr"/>
- <param name="artifact-type" value="jar"/>
- </antcall>
- <antcall target="download-via-maven"><param name="project-path"
value="${derby-package}"/><param name="artifact-version"
value="${derby-version}"/><param name="target" value="lib"/>
- <param name="artifact-name" value="derbyLocale_ru"/>
- <param name="artifact-type" value="jar"/>
- </antcall>
- <antcall target="download-via-maven"><param name="project-path"
value="${derby-package}"/><param name="artifact-version"
value="${derby-version}"/><param name="target" value="lib"/>
- <param name="artifact-name" value="derbyLocale_ko_KR"/>
- <param name="artifact-type" value="jar"/>
- </antcall>
- <antcall target="download-via-maven"><param name="project-path"
value="${derby-package}"/><param name="artifact-version"
value="${derby-version}"/><param name="target" value="lib"/>
- <param name="artifact-name" value="derbyLocale_hu"/>
- <param name="artifact-type" value="jar"/>
- </antcall>
- <antcall target="download-via-maven"><param name="project-path"
value="${derby-package}"/><param name="artifact-version"
value="${derby-version}"/><param name="target" value="lib"/>
- <param name="artifact-name" value="derbyLocale_pl"/>
- <param name="artifact-type" value="jar"/>
- </antcall>
- </target>
-
<target name="download-hsqldb">
<mkdir dir="lib"/>
<!--mkdir dir="build/download"/>
@@ -1810,7 +1710,7 @@ Use Apache Forrest version forrest-0.9-d
</antcall>
</target>
- <target name="make-core-deps"
depends="download-mongo-java-driver,download-jira-client,download-google-api-client,download-dropbox-client,download-solrj,download-zookeeper,download-httpcomponents,download-json,download-hsqldb,download-xerces,download-commons,download-elasticsearch-plugin,download-solr-plugins,download-sharepoint-plugins,download-jstl,download-xmlgraphics-commons,download-wstx-asl,download-xmlsec,download-xml-apis,download-wss4j,download-velocity,download-streambuffer,download-stax,download-servlet-api,download-xml-resolver,download-osgi,download-opensaml,download-mimepull,download-mail,download-log4j,download-junit,download-jaxws,download-glassfish,download-jaxb,download-tomcat,download-h2,download-h2-support,download-geronimo-specs,download-fop,download-derby,download-postgresql,download-axis,download-saaj,download-wsdl4j,download-castor,download-jetty,download-slf4j,download-xalan,download-activation,download-avalon-framework,download-poi,download-chemistry,do
wnload-ecj,download-hadoop,download-protobuf,download-tika,download-jackson">
+ <target name="make-core-deps"
depends="download-mongo-java-driver,download-jira-client,download-google-api-client,download-dropbox-client,download-solrj,download-zookeeper,download-httpcomponents,download-json,download-hsqldb,download-xerces,download-commons,download-elasticsearch-plugin,download-solr-plugins,download-sharepoint-plugins,download-jstl,download-xmlgraphics-commons,download-wstx-asl,download-xmlsec,download-xml-apis,download-wss4j,download-velocity,download-streambuffer,download-stax,download-servlet-api,download-xml-resolver,download-osgi,download-opensaml,download-mimepull,download-mail,download-log4j,download-junit,download-jaxws,download-glassfish,download-jaxb,download-tomcat,download-h2,download-h2-support,download-geronimo-specs,download-fop,download-postgresql,download-axis,download-saaj,download-wsdl4j,download-castor,download-jetty,download-slf4j,download-xalan,download-activation,download-avalon-framework,download-poi,download-chemistry,download-ecj,down
load-hadoop,download-protobuf,download-tika,download-jackson">
<copy todir="lib">
<fileset dir="lib-license" includes="*.txt"/>
</copy>
Modified: manifoldcf/trunk/connectors/activedirectory/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/activedirectory/pom.xml?rev=1627345&r1=1627344&r2=1627345&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/activedirectory/pom.xml (original)
+++ manifoldcf/trunk/connectors/activedirectory/pom.xml Wed Sep 24 15:18:02 2014
@@ -242,12 +242,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>${derby.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${mysql.version}</version>
Modified: manifoldcf/trunk/connectors/alfresco/build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/alfresco/build.xml?rev=1627345&r1=1627344&r2=1627345&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/alfresco/build.xml (original)
+++ manifoldcf/trunk/connectors/alfresco/build.xml Wed Sep 24 15:18:02 2014
@@ -100,9 +100,9 @@
</antcall>
</target>
- <target name="run-IT-derby" depends="compile-tests,pretest-check"
if="canTest">
- <mkdir dir="test-derby-output"/>
- <junit fork="true" maxmemory="1024m" dir="test-derby-output"
outputtoformatters="true" showoutput="true" haltonfailure="true">
+ <target name="run-IT-HSQLDB" depends="compile-tests,pretest-check"
if="canTest">
+ <mkdir dir="test-HSQLDB-output"/>
+ <junit fork="true" maxmemory="1024m" dir="test-HSQLDB-output"
outputtoformatters="true" showoutput="true" haltonfailure="true">
<jvmarg
value="-DcrawlerWarPath=${mcf-dist}/web/war/mcf-crawler-ui.war"/>
<jvmarg
value="-DauthorityserviceWarPath=${mcf-dist}/web/war/mcf-authority-service.war"/>
<jvmarg
value="-DapiWarPath=${mcf-dist}/web/war/mcf-api-service.war"/>
@@ -121,9 +121,9 @@
<pathelement location="build/connector-tests/classes"/>
</classpath>
<formatter type="brief" usefile="false"/>
- <batchtest todir="test-derby-output">
+ <batchtest todir="test-HSQLDB-output">
<fileset dir="build/connector-tests/classes">
- <include name="**/*DerbyIT.class"/>
+ <include name="**/*HSQLDBIT.class"/>
</fileset>
</batchtest>
</junit>
Modified: manifoldcf/trunk/connectors/alfresco/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/alfresco/pom.xml?rev=1627345&r1=1627344&r2=1627345&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/alfresco/pom.xml (original)
+++ manifoldcf/trunk/connectors/alfresco/pom.xml Wed Sep 24 15:18:02 2014
@@ -373,12 +373,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>${derby.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${mysql.version}</version>
Modified: manifoldcf/trunk/connectors/amazoncloudsearch/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/amazoncloudsearch/pom.xml?rev=1627345&r1=1627344&r2=1627345&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/amazoncloudsearch/pom.xml (original)
+++ manifoldcf/trunk/connectors/amazoncloudsearch/pom.xml Wed Sep 24 15:18:02
2014
@@ -268,12 +268,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>${derby.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${mysql.version}</version>
Modified: manifoldcf/trunk/connectors/cmis/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/cmis/pom.xml?rev=1627345&r1=1627344&r2=1627345&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/cmis/pom.xml (original)
+++ manifoldcf/trunk/connectors/cmis/pom.xml Wed Sep 24 15:18:02 2014
@@ -280,12 +280,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>${derby.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${mysql.version}</version>
Modified: manifoldcf/trunk/connectors/documentfilter/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/documentfilter/pom.xml?rev=1627345&r1=1627344&r2=1627345&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/documentfilter/pom.xml (original)
+++ manifoldcf/trunk/connectors/documentfilter/pom.xml Wed Sep 24 15:18:02 2014
@@ -242,12 +242,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>${derby.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${mysql.version}</version>
Modified: manifoldcf/trunk/connectors/dropbox/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/dropbox/pom.xml?rev=1627345&r1=1627344&r2=1627345&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/dropbox/pom.xml (original)
+++ manifoldcf/trunk/connectors/dropbox/pom.xml Wed Sep 24 15:18:02 2014
@@ -284,12 +284,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>${derby.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${mysql.version}</version>
Modified: manifoldcf/trunk/connectors/elasticsearch/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/elasticsearch/pom.xml?rev=1627345&r1=1627344&r2=1627345&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/elasticsearch/pom.xml (original)
+++ manifoldcf/trunk/connectors/elasticsearch/pom.xml Wed Sep 24 15:18:02 2014
@@ -277,12 +277,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>${derby.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${mysql.version}</version>
Modified: manifoldcf/trunk/connectors/filesystem/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/filesystem/pom.xml?rev=1627345&r1=1627344&r2=1627345&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/filesystem/pom.xml (original)
+++ manifoldcf/trunk/connectors/filesystem/pom.xml Wed Sep 24 15:18:02 2014
@@ -248,12 +248,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>${derby.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${mysql.version}</version>
Modified: manifoldcf/trunk/connectors/forcedmetadata/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/forcedmetadata/pom.xml?rev=1627345&r1=1627344&r2=1627345&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/forcedmetadata/pom.xml (original)
+++ manifoldcf/trunk/connectors/forcedmetadata/pom.xml Wed Sep 24 15:18:02 2014
@@ -235,12 +235,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>${derby.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${mysql.version}</version>
Modified: manifoldcf/trunk/connectors/generic/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/generic/pom.xml?rev=1627345&r1=1627344&r2=1627345&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/generic/pom.xml (original)
+++ manifoldcf/trunk/connectors/generic/pom.xml Wed Sep 24 15:18:02 2014
@@ -247,12 +247,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>${derby.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${mysql.version}</version>
Modified: manifoldcf/trunk/connectors/googledrive/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/googledrive/pom.xml?rev=1627345&r1=1627344&r2=1627345&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/googledrive/pom.xml (original)
+++ manifoldcf/trunk/connectors/googledrive/pom.xml Wed Sep 24 15:18:02 2014
@@ -261,12 +261,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>${derby.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${mysql.version}</version>
Modified: manifoldcf/trunk/connectors/gridfs/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/gridfs/pom.xml?rev=1627345&r1=1627344&r2=1627345&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/gridfs/pom.xml (original)
+++ manifoldcf/trunk/connectors/gridfs/pom.xml Wed Sep 24 15:18:02 2014
@@ -122,12 +122,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>${derby.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${mysql.version}</version>
Modified: manifoldcf/trunk/connectors/gts/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/gts/pom.xml?rev=1627345&r1=1627344&r2=1627345&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/gts/pom.xml (original)
+++ manifoldcf/trunk/connectors/gts/pom.xml Wed Sep 24 15:18:02 2014
@@ -245,12 +245,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>${derby.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${mysql.version}</version>
Modified: manifoldcf/trunk/connectors/hdfs/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/hdfs/pom.xml?rev=1627345&r1=1627344&r2=1627345&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/hdfs/pom.xml (original)
+++ manifoldcf/trunk/connectors/hdfs/pom.xml Wed Sep 24 15:18:02 2014
@@ -241,12 +241,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>${derby.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${mysql.version}</version>
Modified: manifoldcf/trunk/connectors/jcifs/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/jcifs/pom.xml?rev=1627345&r1=1627344&r2=1627345&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/jcifs/pom.xml (original)
+++ manifoldcf/trunk/connectors/jcifs/pom.xml Wed Sep 24 15:18:02 2014
@@ -247,12 +247,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>${derby.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${mysql.version}</version>
Modified: manifoldcf/trunk/connectors/jdbc/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/jdbc/pom.xml?rev=1627345&r1=1627344&r2=1627345&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/jdbc/pom.xml (original)
+++ manifoldcf/trunk/connectors/jdbc/pom.xml Wed Sep 24 15:18:02 2014
@@ -240,12 +240,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>${derby.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${mysql.version}</version>
Modified: manifoldcf/trunk/connectors/jira/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/jira/pom.xml?rev=1627345&r1=1627344&r2=1627345&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/jira/pom.xml (original)
+++ manifoldcf/trunk/connectors/jira/pom.xml Wed Sep 24 15:18:02 2014
@@ -261,12 +261,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>${derby.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${mysql.version}</version>
Modified: manifoldcf/trunk/connectors/ldap/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/ldap/pom.xml?rev=1627345&r1=1627344&r2=1627345&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/ldap/pom.xml (original)
+++ manifoldcf/trunk/connectors/ldap/pom.xml Wed Sep 24 15:18:02 2014
@@ -240,12 +240,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>${derby.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${mysql.version}</version>
Modified: manifoldcf/trunk/connectors/nullauthority/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/nullauthority/pom.xml?rev=1627345&r1=1627344&r2=1627345&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/nullauthority/pom.xml (original)
+++ manifoldcf/trunk/connectors/nullauthority/pom.xml Wed Sep 24 15:18:02 2014
@@ -240,12 +240,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>${derby.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${mysql.version}</version>
Modified: manifoldcf/trunk/connectors/nulloutput/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/nulloutput/pom.xml?rev=1627345&r1=1627344&r2=1627345&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/nulloutput/pom.xml (original)
+++ manifoldcf/trunk/connectors/nulloutput/pom.xml Wed Sep 24 15:18:02 2014
@@ -235,12 +235,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>${derby.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${mysql.version}</version>
Modified: manifoldcf/trunk/connectors/nulltransformation/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/nulltransformation/pom.xml?rev=1627345&r1=1627344&r2=1627345&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/nulltransformation/pom.xml (original)
+++ manifoldcf/trunk/connectors/nulltransformation/pom.xml Wed Sep 24 15:18:02
2014
@@ -235,12 +235,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>${derby.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${mysql.version}</version>
Modified: manifoldcf/trunk/connectors/opensearchserver/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/opensearchserver/pom.xml?rev=1627345&r1=1627344&r2=1627345&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/opensearchserver/pom.xml (original)
+++ manifoldcf/trunk/connectors/opensearchserver/pom.xml Wed Sep 24 15:18:02
2014
@@ -264,12 +264,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>${derby.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${mysql.version}</version>
Modified: manifoldcf/trunk/connectors/regexpmapper/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/regexpmapper/pom.xml?rev=1627345&r1=1627344&r2=1627345&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/regexpmapper/pom.xml (original)
+++ manifoldcf/trunk/connectors/regexpmapper/pom.xml Wed Sep 24 15:18:02 2014
@@ -241,12 +241,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>${derby.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${mysql.version}</version>
Propchange: manifoldcf/trunk/connectors/rss/
------------------------------------------------------------------------------
Merged /manifoldcf/branches/CONNECTORS-1044/connectors/rss:r1627162-1627342
Modified: manifoldcf/trunk/connectors/rss/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/rss/pom.xml?rev=1627345&r1=1627344&r2=1627345&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/rss/pom.xml (original)
+++ manifoldcf/trunk/connectors/rss/pom.xml Wed Sep 24 15:18:02 2014
@@ -268,12 +268,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>${derby.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${mysql.version}</version>
Propchange: manifoldcf/trunk/connectors/sharepoint/
------------------------------------------------------------------------------
Merged
/manifoldcf/branches/CONNECTORS-1044/connectors/sharepoint:r1627162-1627342
Modified: manifoldcf/trunk/connectors/sharepoint/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/sharepoint/pom.xml?rev=1627345&r1=1627344&r2=1627345&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/sharepoint/pom.xml (original)
+++ manifoldcf/trunk/connectors/sharepoint/pom.xml Wed Sep 24 15:18:02 2014
@@ -346,12 +346,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>${derby.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${mysql.version}</version>
Modified: manifoldcf/trunk/connectors/solr/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/solr/pom.xml?rev=1627345&r1=1627344&r2=1627345&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/solr/pom.xml (original)
+++ manifoldcf/trunk/connectors/solr/pom.xml Wed Sep 24 15:18:02 2014
@@ -265,12 +265,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>${derby.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${mysql.version}</version>
Modified: manifoldcf/trunk/connectors/tika/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/tika/pom.xml?rev=1627345&r1=1627344&r2=1627345&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/tika/pom.xml (original)
+++ manifoldcf/trunk/connectors/tika/pom.xml Wed Sep 24 15:18:02 2014
@@ -299,12 +299,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>${derby.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${mysql.version}</version>
Modified: manifoldcf/trunk/connectors/webcrawler/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/webcrawler/pom.xml?rev=1627345&r1=1627344&r2=1627345&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/webcrawler/pom.xml (original)
+++ manifoldcf/trunk/connectors/webcrawler/pom.xml Wed Sep 24 15:18:02 2014
@@ -260,12 +260,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>${derby.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${mysql.version}</version>
Propchange: manifoldcf/trunk/connectors/wiki/
------------------------------------------------------------------------------
Merged /manifoldcf/branches/CONNECTORS-1044/connectors/wiki:r1627162-1627342
Modified: manifoldcf/trunk/connectors/wiki/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/wiki/pom.xml?rev=1627345&r1=1627344&r2=1627345&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/wiki/pom.xml (original)
+++ manifoldcf/trunk/connectors/wiki/pom.xml Wed Sep 24 15:18:02 2014
@@ -260,12 +260,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>${derby.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${mysql.version}</version>
Modified: manifoldcf/trunk/framework/agents/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/agents/pom.xml?rev=1627345&r1=1627344&r2=1627345&view=diff
==============================================================================
--- manifoldcf/trunk/framework/agents/pom.xml (original)
+++ manifoldcf/trunk/framework/agents/pom.xml Wed Sep 24 15:18:02 2014
@@ -90,12 +90,6 @@
<version>${hsqldb.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>${derby.version}</version>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: manifoldcf/trunk/framework/api-service/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/api-service/pom.xml?rev=1627345&r1=1627344&r2=1627345&view=diff
==============================================================================
--- manifoldcf/trunk/framework/api-service/pom.xml (original)
+++ manifoldcf/trunk/framework/api-service/pom.xml Wed Sep 24 15:18:02 2014
@@ -69,102 +69,6 @@
<!-- database dependencies -->
<dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>${derby.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbytools</artifactId>
- <version>${derby.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbynet</artifactId>
- <version>${derby.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbyLocale_it</artifactId>
- <version>${derby.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbyLocale_de_DE</artifactId>
- <version>${derby.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbyLocale_es</artifactId>
- <version>${derby.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <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>
- <dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>${hsqldb.version}</version>
Modified: manifoldcf/trunk/framework/authority-service/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/authority-service/pom.xml?rev=1627345&r1=1627344&r2=1627345&view=diff
==============================================================================
--- manifoldcf/trunk/framework/authority-service/pom.xml (original)
+++ manifoldcf/trunk/framework/authority-service/pom.xml Wed Sep 24 15:18:02
2014
@@ -69,102 +69,6 @@
<!-- database dependencies -->
<dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>${derby.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbytools</artifactId>
- <version>${derby.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbynet</artifactId>
- <version>${derby.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbyLocale_it</artifactId>
- <version>${derby.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbyLocale_de_DE</artifactId>
- <version>${derby.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbyLocale_es</artifactId>
- <version>${derby.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <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>
- <dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>${hsqldb.version}</version>
