You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by sc...@apache.org on 2021/12/17 10:50:49 UTC
svn commit: r1896094 - in /manifoldcf/trunk: ./ connectors/confluence-v6/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/v6/ connectors/elasticsearch/connector/src/test/java/org/apache/manifoldcf/agents/output/elasticsearch/...
Author: schuch
Date: Fri Dec 17 10:50:48 2021
New Revision: 1896094
URL: http://svn.apache.org/viewvc?rev=1896094&view=rev
Log:
CONNECTORS-1689: Fix forbidden api violations and revamp travis ci definitions and add precommit checks to travis ci
Modified:
manifoldcf/trunk/.travis.yml
manifoldcf/trunk/connectors/confluence-v6/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/v6/ConfluenceRepositoryConnector.java
manifoldcf/trunk/connectors/elasticsearch/connector/src/test/java/org/apache/manifoldcf/agents/output/elasticsearch/tests/BaseITHSQLDB.java
manifoldcf/trunk/connectors/nuxeo/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/nuxeo/NuxeoConnectorTest.java
manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/solr/SolrIngesterConnector.java
manifoldcf/trunk/connectors/tikaservice-rmeta/connector/src/main/java/org/apache/manifoldcf/agents/transformation/tikaservice/rmeta/TikaExtractor.java
Modified: manifoldcf/trunk/.travis.yml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/.travis.yml?rev=1896094&r1=1896093&r2=1896094&view=diff
==============================================================================
--- manifoldcf/trunk/.travis.yml (original)
+++ manifoldcf/trunk/.travis.yml Fri Dec 17 10:50:48 2021
@@ -13,15 +13,24 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-install: true
git:
depth: 1
-env:
- matrix:
- - TEST_SCRIPT="mvn -q install -DskipITs"
- - TEST_SCRIPT="mvn --no-transfer-progress package -DskipTests -DskipITs javadoc:javadoc"
- - TEST_SCRIPT="ant make-core-deps make-deps test"
-script: $TEST_SCRIPT
+install: ant make-core-deps make-deps
+jobs:
+ include:
+ - name: rat sources & forbidden apis
+ stage: validate
+ script: ant precommit
+ - name: maven build
+ stage: build_test
+ script: mvn --batch-mode --no-transfer-progress verify javadoc:javadoc -DskipITs
+ install: true
+ cache:
+ directories:
+ - $HOME/.m2
+ - name: ant build
+ stage: build_test
+ script: ant test
language: java
jdk:
- openjdk8
@@ -30,8 +39,5 @@ addons:
packages:
- ant
- ant-optional
-cache:
- directories:
- - $HOME/.m2
notifications:
email: false
Modified: manifoldcf/trunk/connectors/confluence-v6/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/v6/ConfluenceRepositoryConnector.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/confluence-v6/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/v6/ConfluenceRepositoryConnector.java?rev=1896094&r1=1896093&r2=1896094&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/confluence-v6/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/v6/ConfluenceRepositoryConnector.java (original)
+++ manifoldcf/trunk/connectors/confluence-v6/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/v6/ConfluenceRepositoryConnector.java Fri Dec 17 10:50:48 2021
@@ -1324,7 +1324,7 @@ public class ConfluenceRepositoryConnect
final String key = entry.getKey();
final String value = entry.getValue().toString();
rd.addField(key, value);
- if (key.toLowerCase().contentEquals("title")) {
+ if (key.toLowerCase(Locale.ROOT).contentEquals("title")) {
rd.addField("stream_name", value);
}
}
Modified: manifoldcf/trunk/connectors/elasticsearch/connector/src/test/java/org/apache/manifoldcf/agents/output/elasticsearch/tests/BaseITHSQLDB.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/elasticsearch/connector/src/test/java/org/apache/manifoldcf/agents/output/elasticsearch/tests/BaseITHSQLDB.java?rev=1896094&r1=1896093&r2=1896094&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/elasticsearch/connector/src/test/java/org/apache/manifoldcf/agents/output/elasticsearch/tests/BaseITHSQLDB.java (original)
+++ manifoldcf/trunk/connectors/elasticsearch/connector/src/test/java/org/apache/manifoldcf/agents/output/elasticsearch/tests/BaseITHSQLDB.java Fri Dec 17 10:50:48 2021
@@ -33,7 +33,8 @@ import org.apache.http.util.EntityUtils;
import org.apache.http.impl.client.HttpClients;
import java.io.IOException;
import java.io.File;
-
+import java.util.Locale;
+
/**
* Base integration tests class for Elastic Search tested against a CMIS repository
@@ -45,7 +46,7 @@ public class BaseITHSQLDB extends org.ap
final static boolean isUnix;
static {
- final String os = System.getProperty("os.name").toLowerCase();
+ final String os = System.getProperty("os.name").toLowerCase(Locale.ROOT);
if (os.contains("win")) {
isUnix = false;
} else {
Modified: manifoldcf/trunk/connectors/nuxeo/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/nuxeo/NuxeoConnectorTest.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/nuxeo/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/nuxeo/NuxeoConnectorTest.java?rev=1896094&r1=1896093&r2=1896094&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/nuxeo/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/nuxeo/NuxeoConnectorTest.java (original)
+++ manifoldcf/trunk/connectors/nuxeo/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/nuxeo/NuxeoConnectorTest.java Fri Dec 17 10:50:48 2021
@@ -28,6 +28,7 @@ import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
+import java.util.Locale;
import java.util.Map;
import java.util.List;
@@ -160,7 +161,7 @@ public class NuxeoConnectorTest {
NuxeoDocumentHelper docMa = mock(NuxeoDocumentHelper.class);
FileBlob blob = mock(FileBlob.class);
Date date = new Date();
- DateFormat df = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSXXX");
+ DateFormat df = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSXXX", Locale.ROOT);
final String lastModified = df.format(date);
final String id = "7995ff6d-1eda-41db-b9de-3ea4037fdb81";
final String path = "/workspaces/folder/001001-0001-000000010690";
@@ -221,7 +222,7 @@ public class NuxeoConnectorTest {
Document doc = mock(Document.class);
Repository repository = mock(Repository.class);
Date date = new Date();
- DateFormat df = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSXXX");
+ DateFormat df = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSXXX", Locale.ROOT);
final String lastModified = df.format(date);
String uid = "297529bf-191a-4c87-8259-28b692394229";
final String path = "/workspaces/folder/001001-0001-000000010690";
Modified: manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/solr/SolrIngesterConnector.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/solr/SolrIngesterConnector.java?rev=1896094&r1=1896093&r2=1896094&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/solr/SolrIngesterConnector.java (original)
+++ manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/solr/SolrIngesterConnector.java Fri Dec 17 10:50:48 2021
@@ -392,7 +392,7 @@ public class SolrIngesterConnector exten
startTime = new Long(lastSeedVersion).longValue();
}
getSession();
- final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
+ final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'", Locale.ROOT);
sdf.setTimeZone(TimeZone.getDefault());
final StringBuilder url = new StringBuilder(solringesterEntryPoint);
@@ -711,7 +711,7 @@ public class SolrIngesterConnector exten
contentFieldValuesString = "";
}
- is = new ByteArrayInputStream(contentFieldValuesString.getBytes());
+ is = new ByteArrayInputStream(contentFieldValuesString.getBytes(StandardCharsets.UTF_8));
// security part
if (securityActivated == true) {
Modified: manifoldcf/trunk/connectors/tikaservice-rmeta/connector/src/main/java/org/apache/manifoldcf/agents/transformation/tikaservice/rmeta/TikaExtractor.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/tikaservice-rmeta/connector/src/main/java/org/apache/manifoldcf/agents/transformation/tikaservice/rmeta/TikaExtractor.java?rev=1896094&r1=1896093&r2=1896094&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/tikaservice-rmeta/connector/src/main/java/org/apache/manifoldcf/agents/transformation/tikaservice/rmeta/TikaExtractor.java (original)
+++ manifoldcf/trunk/connectors/tikaservice-rmeta/connector/src/main/java/org/apache/manifoldcf/agents/transformation/tikaservice/rmeta/TikaExtractor.java Fri Dec 17 10:50:48 2021
@@ -954,7 +954,7 @@ public class TikaExtractor extends org.a
final Iterator<String> fields = document.getFields();
while (fields.hasNext()) {
final String fieldname = fields.next();
- if (fieldname.toLowerCase().equals(fieldName.toLowerCase())) {
+ if (fieldname.equalsIgnoreCase(fieldName)) {
document.removeField(fieldname);
break;
}
@@ -972,7 +972,7 @@ public class TikaExtractor extends org.a
if (filename != null) {
final int index = filename.lastIndexOf('.');
if (index != -1) {
- extension = filename.substring(index + 1).toLowerCase();
+ extension = filename.substring(index + 1).toLowerCase(Locale.ROOT);
}
}
return extension;
@@ -986,7 +986,7 @@ public class TikaExtractor extends org.a
*/
private boolean isArchive(final String filename, final String mimeType) {
final boolean filenameCheck = archiveExtensions.contains(getExtension(filename));
- final boolean mimeCheck = archiveMimes.contains(mimeType.toLowerCase());
+ final boolean mimeCheck = archiveMimes.contains(mimeType.toLowerCase(Locale.ROOT));
if (filenameCheck || mimeCheck) {
return true;
} else {