#1 fix log4j

DICE-UNC · Dec 21, 2021 · b17fb80 · b17fb80
1 parent 4d291a4
commit b17fb80
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 22 deletions.
diff --git a/emc-metalnx-services/src/main/java/com/emc/metalnx/services/irods/CollectionServiceImpl.java b/emc-metalnx-services/src/main/java/com/emc/metalnx/services/irods/CollectionServiceImpl.java
@@ -762,17 +762,17 @@ public String prepareFilesForDownload(List<String> sourcePaths) throws IOExcepti
 				throw new FileSizeTooLargeException("file size too large for bundle creation");
 			} else {
 				/*
-				 * Setting default BundleType to ZIP TODO: Add download bundle option as .tar to
-				 * user preference
+				 * Setting default BundleType to TAR. In the future multiple bundle types may be
+				 * supported
 				 */
-				zipServiceConfiguration.setPreferredBundleType(BundleType.ZIP);
+				zipServiceConfiguration.setPreferredBundleType(BundleType.TAR);
 				jargonZipService.setZipServiceConfiguration(zipServiceConfiguration);
 
 				if (!sourcePaths.isEmpty()) {
 					logger.info("Copying files to be downloaded to the temporary collection");
-					IRODSFile zippedFile = jargonZipService.obtainBundleAsIrodsFileGivenPaths(sourcePaths);
-					path = zippedFile.getPath();
-					logger.info("Zipped collection path: {}", path);
+					IRODSFile bundledFile = jargonZipService.obtainBundleAsIrodsFileGivenPaths(sourcePaths);
+					path = bundledFile.getPath();
+					logger.info("bundled collection path: {}", path);
 				}
 			}
 		} catch (JargonException e) {

diff --git a/pom.xml b/pom.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.irods.jargon</groupId>
 	<artifactId>jargon-irods-ext</artifactId>
 	<parent>
 		<groupId>org.irods</groupId>
 		<artifactId>jargon-pom</artifactId>
-		<version>4.3.2.3-SNAPSHOT</version>
+		<version>4.3.2.4-RELEASE</version>
 	</parent>
 	<properties>
 		<hibernate.version>4.3.11.Final</hibernate.version>
@@ -23,7 +22,7 @@
 		<el.version>2.2</el.version>
 		<!-- xml apis version -->
 		<!-- https://mvnrepository.com/artifact/xml-apis/xml-apis -->
-   	<xml.apis.version>2.0.2</xml.apis.version>
+		<xml.apis.version>2.0.2</xml.apis.version>
 	</properties>
 	<packaging>pom</packaging>
 	<name>jargon-extensions</name>
@@ -92,9 +91,9 @@
 			</dependency>
 			<!-- https://mvnrepository.com/artifact/xml-apis/xml-apis -->
 			<dependency>
-			    <groupId>xml-apis</groupId>
-			    <artifactId>xml-apis</artifactId>
-			    <version>${xml.apis.version}</version>
+				<groupId>xml-apis</groupId>
+				<artifactId>xml-apis</artifactId>
+				<version>${xml.apis.version}</version>
 			</dependency>
 		</dependencies>
 	</dependencyManagement>
@@ -104,17 +103,13 @@
 			<artifactId>slf4j-api</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-log4j12</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-core</artifactId>
 		</dependency>
 		<dependency>
-				<groupId>org.mockito</groupId>
-				<artifactId>mockito-core</artifactId>
-				<scope>test</scope>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-core</artifactId>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>junit</groupId>