Merge pull request #616 from internetarchive/webarchive-commons-1.1.10

Remove log4j from main Heritrix distribution
internetarchive · Oct 18, 2024 · 33f0095 · 33f0095
2 parents d8aa090 + cbd7f37
commit 33f0095
Show file tree

Hide file tree

Showing 12 changed files with 64 additions and 274 deletions.
diff --git a/commons/pom.xml b/commons/pom.xml
@@ -151,14 +151,9 @@
 		<dependency>
 			<groupId>org.netpreserve.commons</groupId>
 			<artifactId>webarchive-commons</artifactId>
-			<version>1.1.8</version>
-			<exclusions>
-				<exclusion>
-					<groupId>org.apache.hadoop</groupId>
-					<artifactId>hadoop-core</artifactId>
-				</exclusion>
-			</exclusions>
+			<version>1.1.10</version>
 		</dependency>
+
 		<dependency>
 			<groupId>com.jcraft</groupId>
 			<artifactId>jsch</artifactId>

diff --git a/commons/src/main/java/org/archive/util/OneLineSimpleLayout.java b/commons/src/main/java/org/archive/util/OneLineSimpleLayout.java
diff --git a/commons/src/test/resources/log4j.xml b/commons/src/test/resources/log4j.xml
diff --git a/contrib/src/main/resources/log4j.xml b/contrib/src/main/resources/log4j.xml
diff --git a/contrib/src/test/resources/log4j.xml b/contrib/src/test/resources/log4j.xml
diff --git a/dist/src/test/resources/log4j.xml b/dist/src/test/resources/log4j.xml
diff --git a/docs/operating.rst b/docs/operating.rst
@@ -198,8 +198,7 @@ Log Files
 Each crawl job has its own set of log files found in the ``logs`` subdirectory of a job launch directory.
 
 Logging can be configured by modifying the ``logging.properties`` file
-that is located under the ``$HERITRIX_HOME/conf`` directory. For information on using
-logging properties, visit http://logging.apache.org/log4j/.
+that is located under the ``$HERITRIX_HOME/conf`` directory.
 
 alerts.log
 ~~~~~~~~~~

diff --git a/engine/pom.xml b/engine/pom.xml
@@ -82,12 +82,6 @@
 			<version>2.3.1</version>
 			<scope>runtime</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.littleshoot</groupId>
-			<artifactId>littleproxy</artifactId>
-			<version>0.4</version>
-			<scope>test</scope>
-		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>

diff --git a/engine/src/test/resources/log4j.xml b/engine/src/test/resources/log4j.xml
diff --git a/modules/pom.xml b/modules/pom.xml
@@ -50,16 +50,16 @@
 			<version>${jetty.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.littleshoot</groupId>
-			<artifactId>littleproxy</artifactId>
-			<version>0.4</version>
+			<groupId>org.eclipse.jetty</groupId>
+			<artifactId>jetty-servlet</artifactId>
+			<version>${jetty.version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.jetty</groupId>
+			<artifactId>jetty-proxy</artifactId>
+			<version>${jetty.version}</version>
 			<scope>test</scope>
-			<exclusions>
-			   <exclusion>
-			      <groupId>org.slf4j</groupId>
-			      <artifactId>slf4j-log4j12</artifactId>
-			   </exclusion>
-			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>