OO-3841: update spring, commons, bouncycastle and poi

pom.xml

@@ -62,7 +62,7 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<targetJdk>1.8</targetJdk>
-		<org.springframework.version>5.1.4.RELEASE</org.springframework.version>
+		<org.springframework.version>5.1.5.RELEASE</org.springframework.version>
 		<org.hibernate.version>5.4.1.Final</org.hibernate.version>
 		<com.sun.jersey.version>1.19.4</com.sun.jersey.version>
 		<apache.cxf>3.2.7</apache.cxf>
@@ -1790,7 +1790,7 @@
 		<dependency>
 			<groupId>commons-codec</groupId>
 			<artifactId>commons-codec</artifactId>
-			<version>1.11</version>
+			<version>1.12</version>
 		</dependency>
 		<dependency>
 			<!-- Used by at least commons-validator -->
@@ -1802,7 +1802,7 @@
 			<!-- Used by email address validator -->
 			<groupId>commons-validator</groupId>
 			<artifactId>commons-validator</artifactId>
-			<version>1.5.0</version>
+			<version>1.6</version>
 			<exclusions>
 				<exclusion>
 					<groupId>commons-logging</groupId>
@@ -1874,12 +1874,12 @@
 		<dependency>
 			<groupId>org.apache.poi</groupId>
 			<artifactId>poi</artifactId>
-			<version>3.17</version>
+			<version>4.0.1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.poi</groupId>
 			<artifactId>poi-scratchpad</artifactId>
-			<version>3.17</version>
+			<version>4.0.1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.pdfbox</groupId>
@@ -1906,12 +1906,12 @@
 		<dependency>
 			<groupId>org.bouncycastle</groupId>
 			<artifactId>bcmail-jdk15on</artifactId>
-			<version>1.60</version>
+			<version>1.61</version>
 		</dependency>
 		<dependency>
 			<groupId>org.bouncycastle</groupId>
 			<artifactId>bcprov-jdk15on</artifactId>
-			<version>1.60</version>
+			<version>1.61</version>
 		</dependency>
 		<dependency>
 			<groupId>org.scribe</groupId>
@@ -2209,7 +2209,7 @@
 		<dependency>
 			<groupId>com.opencsv</groupId>
 			<artifactId>opencsv</artifactId>
-			<version>4.4</version>
+			<version>4.5</version>
 			<exclusions>
 				<exclusion>
 					<groupId>commons-logging</groupId>
@@ -2469,7 +2469,7 @@
 		<dependency>
 			<groupId>org.assertj</groupId>
 			<artifactId>assertj-core</artifactId>
-			<version>3.6.1</version>
+			<version>3.12.0</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -2481,7 +2481,7 @@
 		<dependency>
 			<groupId>xmlunit</groupId>
 			<artifactId>xmlunit</artifactId>
-			<version>1.5</version>
+			<version>1.6</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -2499,7 +2499,7 @@
 		<dependency>
 			<groupId>org.zapodot</groupId>
 			<artifactId>embedded-ldap-junit</artifactId>
-			<version>0.5.2</version>
+			<version>0.7</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -2518,7 +2518,7 @@
 		<dependency>
 			<groupId>org.jboss.arquillian.container</groupId>
 			<artifactId>arquillian-tomcat-managed-7</artifactId>
-			<version>1.0.0</version>
+			<version>1.1.0.Final</version>
 		<scope>test</scope>
       	</dependency>
 		<dependency>
@@ -2529,7 +2529,7 @@
 		<dependency>
 			<groupId>org.eu.ingwar.tools</groupId>
 			<artifactId>arquillian-suite-extension</artifactId>
-			<version>1.1.4</version>
+			<version>1.2.0</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>

src/main/java/org/olat/core/util/mail/EmailAddressValidator.java

@@ -39,7 +39,6 @@ public class EmailAddressValidator {
 	 */
 	public static boolean isValidEmailAddress(String mailAddress) {
 		// Validate an email address
-		boolean isAddressValid = validator.isValid(mailAddress);
-		return isAddressValid;
+		return validator.isValid(mailAddress);
 	}
 }

src/main/java/org/olat/search/service/GetDocumentByCallable.java

@@ -65,17 +65,16 @@ class GetDocumentByCallable implements Callable<Document> {
 	public Document call() {
 		Document doc = null;
 		IndexSearcher searcher = null;
-		try {
+		try(KeywordAnalyzer analyzer=new KeywordAnalyzer()) {
 			if (searchService.existIndex()) {
 				searcher = searchService.getIndexSearcher();
 				String url = Encoder.md5hash(resourceUrl);
 				String queryStr = "+" + AbstractOlatDocument.RESOURCEURL_MD5_FIELD_NAME + ":\"" + url + "\"";
-				QueryParser idQueryParser = new QueryParser(queryStr, new KeywordAnalyzer());
+				QueryParser idQueryParser = new QueryParser(queryStr, analyzer);
 				Query query = idQueryParser.parse(queryStr);
 				
 				TopDocs docs = searcher.search(query, 500);
 				long numOfDocs = docs.totalHits;
-				
 
 				Set<String> retrievedFields = new HashSet<>();
 				retrievedFields.add(AbstractOlatDocument.RESOURCEURL_FIELD_NAME);

src/main/java/org/olat/search/service/document/file/ExcelDocument.java

@@ -75,9 +75,8 @@ public class ExcelDocument extends FileDocument {
 		int sheetNullCounter = 0;
 
 		try(BufferedInputStream bis = new BufferedInputStream(leaf.getInputStream());
-				HSSFWorkbook workbook = new HSSFWorkbook(new POIFSFileSystem(bis));) {
-
-			LimitedContentWriter content = new LimitedContentWriter((int)leaf.getSize(), FileDocumentFactory.getMaxFileSize());
+				HSSFWorkbook workbook = new HSSFWorkbook(new POIFSFileSystem(bis));
+				LimitedContentWriter content = new LimitedContentWriter((int)leaf.getSize(), FileDocumentFactory.getMaxFileSize())) {
 			for (int sheetNumber = 0; sheetNumber < workbook.getNumberOfSheets(); sheetNumber++) {
 				HSSFSheet sheet = workbook.getSheetAt(sheetNumber);
 				if (sheet != null) {
@@ -87,7 +86,7 @@ public class ExcelDocument extends FileDocument {
 							for (int cellNumber = row.getFirstCellNum(); cellNumber <= row.getLastCellNum(); cellNumber++) {
 								HSSFCell cell = row.getCell(cellNumber);
 								if (cell != null) {
-									if (cell.getCellTypeEnum() == CellType.STRING) {
+									if (cell.getCellType() == CellType.STRING) {
 										content.append(cell.getStringCellValue()).append(' ');
 									}
 								} else {
@@ -108,7 +107,6 @@ public class ExcelDocument extends FileDocument {
 							+ sheetNullCounter);
 				}
 			}
-			content.close();
 			return new FileContent(content.toString());
 		} catch (Exception ex) {
 			throw new DocumentException("Can not read XLS Content. File=" + leaf.getName(), ex);

src/main/java/org/olat/search/service/document/file/ExcelOOXMLDocument.java

@@ -81,16 +81,17 @@ public class ExcelOOXMLDocument extends FileDocument {
 	
 	private String parseSheets(Map<String,String> sharedStrings, VFSLeaf leaf)  throws IOException, DocumentException {
 		try(InputStream stream = leaf.getInputStream();
-				ZipInputStream zip = new ZipInputStream(stream)) {
+				ZipInputStream zip = new ZipInputStream(stream);
+				LimitedContentWriter writer = new LimitedContentWriter(100000, FileDocumentFactory.getMaxFileSize())) {
 			
 			ZipEntry entry = zip.getNextEntry();
-			LimitedContentWriter writer = new LimitedContentWriter(100000, FileDocumentFactory.getMaxFileSize());
+			
 			while (entry != null) {
 				if(writer.accept()) {
 					String name = entry.getName();
 					if(name.startsWith(SHEET) && name.endsWith(".xml")) {
 						OfficeDocumentHandler dh = new OfficeDocumentHandler(writer, sharedStrings);
-						parse(new ShieldInputStream(zip), dh);
+						parse(zip, dh);
 					}
 				}
 				entry = zip.getNextEntry();
@@ -112,7 +113,7 @@ public class ExcelOOXMLDocument extends FileDocument {
 			while (entry != null) {
 				String name = entry.getName();
 				if(name.endsWith("xl/sharedStrings.xml")) {
-					parse(new ShieldInputStream(zip), dh);
+					parse(zip, dh);
 					break;
 				}
 				entry = zip.getNextEntry();
@@ -125,8 +126,8 @@ public class ExcelOOXMLDocument extends FileDocument {
 		}
 	}
 	
-	private void parse(InputStream stream, DefaultHandler handler) throws DocumentException {
-		try {
+	private void parse(ZipInputStream zip, DefaultHandler handler) throws DocumentException {
+		try(InputStream in=new ShieldInputStream(zip)) {
 			XMLReader parser = XMLReaderFactory.createXMLReader();
 			parser.setContentHandler(handler);
 			parser.setEntityResolver(handler);
@@ -135,7 +136,7 @@ public class ExcelOOXMLDocument extends FileDocument {
 			} catch(Exception e) {
 				log.error("Cannot deactivate validation", e);
 			}
-			parser.parse(new InputSource(stream));
+			parser.parse(new InputSource(in));
 		} catch (Exception e) {
 			throw new DocumentException("XML parser configuration error", e);
 		}

src/main/java/org/olat/search/service/document/file/PowerPointDocument.java

@@ -71,8 +71,8 @@ public class PowerPointDocument extends FileDocument {
 	@Override
 	public FileContent readContent(VFSLeaf leaf) throws IOException,DocumentException {
 		if (log.isDebug()) log.debug("read PPT Content of leaf=" + leaf.getName());
-		try (BufferedInputStream bis = new BufferedInputStream(leaf.getInputStream())) {
-			LimitedContentWriter oStream = new LimitedContentWriter(100000, FileDocumentFactory.getMaxFileSize());
+		try (BufferedInputStream bis = new BufferedInputStream(leaf.getInputStream());
+				LimitedContentWriter oStream = new LimitedContentWriter(100000, FileDocumentFactory.getMaxFileSize())) {
 			extractText(bis, oStream);
 			return new FileContent(oStream.toString());			
 		} catch (Exception e) {
@@ -98,10 +98,8 @@ public class PowerPointDocument extends FileDocument {
 		public void processPOIFSReaderEvent(POIFSReaderEvent event) {
 			int errorCounter = 0;
       
-			try {
-				DocumentInputStream dis = event.getStream();
-        
-				byte btoWrite[] = new byte[dis.available()];
+			try(DocumentInputStream dis = event.getStream()) {
+				byte[] btoWrite = new byte[dis.available()];
 				dis.read(btoWrite, 0, dis.available());
 				for (int i = 0; i < btoWrite.length - 20; i++) {
 					long type = LittleEndian.getUShort(btoWrite, i + 2);
@@ -133,8 +131,7 @@ public class PowerPointDocument extends FileDocument {
 		private String removeUnvisibleChars(String inputString) {
 			Pattern p = Pattern.compile("[^a-zA-Z0-9\n\r!&#<>{}]");
 			Matcher m = p.matcher(inputString);
-			String output = m.replaceAll(" ");
-			return output;
+			return m.replaceAll(" ");
 		}
 	}
 }

src/test/java/org/olat/core/util/mail/EmailAddressValidatorTest.java

@@ -21,8 +21,6 @@ package org.olat.core.util.mail;
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
 
 /**
  * Description:<br>
@@ -32,10 +30,10 @@ import org.junit.runners.JUnit4;
  * Initial Date:  14.07.2009 <br>
  * @author gnaegi
  */
-@RunWith(JUnit4.class)
 public class EmailAddressValidatorTest {
 
-	@Test public void testPlainText() {
+	@Test
+	public void testPlainText() {
 		// correct stuff
 		Assert.assertTrue(EmailAddressValidator.isValidEmailAddress("contact@openolat.org"));
 		Assert.assertTrue(EmailAddressValidator.isValidEmailAddress("hello.world@crazy.world"));

src/test/java/org/olat/search/service/document/file/OfficeDocumentTest.java

@@ -165,5 +165,7 @@ public class OfficeDocumentTest extends OlatTestCase {
 		Assert.assertNotNull(content);
 		String body = content.getContent();
 		Assert.assertTrue(body.contains("Sample Powerpoint Slide"));
+		Assert.assertTrue(body.contains("Service Release 1"));
+		Assert.assertTrue(body.contains("full text search"));
 	}
 }
\ No newline at end of file