Author: kwright
Date: Thu Oct 19 12:14:05 2023
New Revision: 1913115
URL: http://svn.apache.org/viewvc?rev=1913115&view=rev
Log:
Pull up kafka update from trunk
Modified:
manifoldcf/branches/release-2.26-branch/ (props changed)
manifoldcf/branches/release-2.26-branch/.gitignore
manifoldcf/branches/release-2.26-branch/build.xml
manifoldcf/branches/release-2.26-branch/connectors/kafka/build.xml
manifoldcf/branches/release-2.26-branch/connectors/kafka/connector/src/main/java/org/apache/manifoldcf/agents/output/kafka/KafkaOutputConnector.java
manifoldcf/branches/release-2.26-branch/connectors/kafka/connector/src/test/java/org/apache/manifoldcf/agents/output/kafka/KafkaLocal.java
manifoldcf/branches/release-2.26-branch/connectors/kafka/pom.xml
manifoldcf/branches/release-2.26-branch/framework/core/pom.xml
manifoldcf/branches/release-2.26-branch/pom.xml
Propchange: manifoldcf/branches/release-2.26-branch/
------------------------------------------------------------------------------
Merged /manifoldcf/trunk:r1913114
Modified: manifoldcf/branches/release-2.26-branch/.gitignore
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/release-2.26-branch/.gitignore?rev=1913115&r1=1913114&r2=1913115&view=diff
==============================================================================
--- manifoldcf/branches/release-2.26-branch/.gitignore (original)
+++ manifoldcf/branches/release-2.26-branch/.gitignore Thu Oct 19 12:14:05 2023
@@ -5,6 +5,11 @@
*.iml
/build/
/lib/
-/dist/
-lib-proprietary/*.jar
-site/fonts/
+/dist/
+lib-proprietary/*.jar
+site/fonts/
+/.DS_Store
+*.class
+/connectors/*/target/classes
+/connectors/*/target/generated-sources
+/connectors/*/target/test-classes
Modified: manifoldcf/branches/release-2.26-branch/build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/release-2.26-branch/build.xml?rev=1913115&r1=1913114&r2=1913115&view=diff
==============================================================================
--- manifoldcf/branches/release-2.26-branch/build.xml (original)
+++ manifoldcf/branches/release-2.26-branch/build.xml Thu Oct 19 12:14:05 2023
@@ -36,8 +36,8 @@
<property name="httpmime.version" value="4.5.13"/>
<property name="httpcore.version" value="4.4.15"/>
<property name="xerces.version" value="2.12.2"/>
- <property name="zookeeper.version" value="3.8.0"/>
- <property name="metrics-core.version" value="4.1.12.1"/>
+ <property name="zookeeper.version" value="3.9.1"/>
+ <property name="metrics-core.version" value="4.2.21"/>
<property name="snappy-java.version" value="1.1.7.7"/>
<property name="mongodb.version" value="2.14.3"/>
<property name="postgresql.version" value="42.1.3"/>
@@ -2198,7 +2198,7 @@ Use Apache Forrest version forrest-0.9-d
<antcall target="download-via-maven">
<param name="target" value="lib"/>
<param name="project-path" value="org/apache/kafka"/>
- <param name="artifact-version" value="0.8.2.1"/>
+ <param name="artifact-version" value="3.6.0"/>
<param name="artifact-name" value="kafka-clients"/>
<param name="artifact-type" value="jar"/>
</antcall>
Modified: manifoldcf/branches/release-2.26-branch/connectors/kafka/build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/release-2.26-branch/connectors/kafka/build.xml?rev=1913115&r1=1913114&r2=1913115&view=diff
==============================================================================
--- manifoldcf/branches/release-2.26-branch/connectors/kafka/build.xml
(original)
+++ manifoldcf/branches/release-2.26-branch/connectors/kafka/build.xml Thu Oct
19 12:14:05 2023
@@ -27,13 +27,13 @@
<isset property="env.MCFDISTPATH"/>
</not>
</condition>
-
- <import file="${mcf-dist}/connector-build.xml"/>
-
- <property name="kafka.version" value="0.8.2.1"/>
-
- <path id="connector-classpath">
- <path refid="mcf-connector-build.connector-classpath"/>
+
+ <import file="${mcf-dist}/connector-build.xml"/>
+
+ <property name="kafka.version" value="3.6.0"/>
+
+ <path id="connector-classpath">
+ <path refid="mcf-connector-build.connector-classpath"/>
<fileset dir="../../lib">
<include name="kafka-clients*.jar"/>
<include name="lz4*.jar"/>
@@ -55,13 +55,62 @@
<target name="download-dependencies">
<mkdir dir="test-materials"/>
<antcall target="download-via-maven">
- <param name="target" value="test-materials"/>
- <param name="project-path" value="org/apache/kafka"/>
- <param name="artifact-version" value="${kafka.version}"/>
- <param name="artifact-name" value="kafka_2.11"/>
- <param name="artifact-type" value="jar"/>
- </antcall>
- <antcall target="download-via-maven">
+ <param name="target" value="test-materials"/>
+ <param name="project-path" value="org/apache/kafka"/>
+ <param name="artifact-version" value="${kafka.version}"/>
+ <param name="artifact-name" value="kafka_2.13"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ <antcall target="download-via-maven">
+ <param name="target" value="test-materials"/>
+ <param name="project-path" value="org/apache/kafka"/>
+ <param name="artifact-version" value="${kafka.version}"/>
+ <param name="artifact-name" value="kafka-server-common"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ <antcall target="download-via-maven">
+ <param name="target" value="test-materials"/>
+ <param name="project-path" value="org/apache/kafka"/>
+ <param name="artifact-version" value="${kafka.version}"/>
+ <param name="artifact-name" value="kafka-group-coordinator"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ <antcall target="download-via-maven">
+ <param name="target" value="test-materials"/>
+ <param name="project-path" value="org/apache/kafka"/>
+ <param name="artifact-version" value="${kafka.version}"/>
+ <param name="artifact-name" value="kafka-raft"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ <antcall target="download-via-maven">
+ <param name="target" value="test-materials"/>
+ <param name="project-path" value="org/apache/kafka"/>
+ <param name="artifact-version" value="${kafka.version}"/>
+ <param name="artifact-name" value="kafka-storage"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ <antcall target="download-via-maven">
+ <param name="target" value="test-materials"/>
+ <param name="project-path" value="org/apache/kafka"/>
+ <param name="artifact-version" value="${kafka.version}"/>
+ <param name="artifact-name" value="kafka-metadata"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ <antcall target="download-via-maven">
+ <param name="target" value="test-materials"/>
+ <param name="project-path" value="com/typesafe/scala-logging"/>
+ <param name="artifact-version" value="3.9.5"/>
+ <param name="artifact-name" value="scala-logging_3"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ <antcall target="download-via-maven">
+ <param name="target" value="test-materials"/>
+ <param name="project-path" value="commons-validator"/>
+ <param name="artifact-version" value="1.7"/>
+ <param name="artifact-name" value="commons-validator"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ <antcall target="download-via-maven">
<param name="target" value="test-materials"/>
<param name="project-path" value="org/apache/commons"/>
<param name="artifact-version" value="3.4"/>
@@ -75,54 +124,68 @@
<param name="artifact-name" value="metrics-core"/>
<param name="artifact-type" value="jar"/>
</antcall>
- <antcall target="download-via-maven">
- <param name="target" value="test-materials"/>
- <param name="project-path" value="org/scala-lang"/>
- <param name="artifact-version" value="2.11.0"/>
- <param name="artifact-name" value="scala-library"/>
- <param name="artifact-type" value="jar"/>
- </antcall>
- <antcall target="download-via-maven">
- <param name="target" value="test-materials"/>
- <param name="project-path" value="net/sf/jopt-simple"/>
- <param name="artifact-version" value="3.2"/>
- <param name="artifact-name" value="jopt-simple"/>
- <param name="artifact-type" value="jar"/>
- </antcall>
- <antcall target="download-via-maven">
- <param name="target" value="test-materials"/>
- <param name="project-path" value="org/scala-lang/modules"/>
- <param name="artifact-version" value="1.0.4"/>
- <param name="artifact-name" value="scala-xml_2.11"/>
- <param name="artifact-type" value="jar"/>
- </antcall>
- <antcall target="download-via-maven">
- <param name="target" value="test-materials"/>
- <param name="project-path" value="org/scala-lang/modules"/>
- <param name="artifact-version" value="1.0.4"/>
- <param name="artifact-name" value="scala-parser-combinators_2.11"/>
- <param name="artifact-type" value="jar"/>
- </antcall>
- <antcall target="download-via-maven">
+ <antcall target="download-via-maven">
+ <param name="target" value="test-materials"/>
+ <param name="project-path" value="org/scala-lang"/>
+ <param name="artifact-version" value="2.13.11"/>
+ <param name="artifact-name" value="scala-library"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ <antcall target="download-via-maven">
+ <param name="target" value="test-materials"/>
+ <param name="project-path" value="net/sf/jopt-simple"/>
+ <param name="artifact-version" value="5.0.4"/>
+ <param name="artifact-name" value="jopt-simple"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ <antcall target="download-via-maven">
+ <param name="target" value="test-materials"/>
+ <param name="project-path" value="org/scala-lang/modules"/>
+ <param name="artifact-version" value="2.2.0"/>
+ <param name="artifact-name" value="scala-xml_2.13"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ <antcall target="download-via-maven">
+ <param name="target" value="test-materials"/>
+ <param name="project-path" value="org/scala-lang/modules"/>
+ <param name="artifact-version" value="2.2.0"/>
+ <param name="artifact-name" value="scala-parser-combinators_2.13"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ <antcall target="download-via-maven">
<param name="target" value="test-materials"/>
<param name="project-path" value="com/101tec"/>
<param name="artifact-version" value="0.6"/>
- <param name="artifact-name" value="zkclient"/>
- <param name="artifact-type" value="jar"/>
- </antcall>
- </target>
-
- <target name="download-cleanup">
+ <param name="artifact-name" value="zkclient"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ <antcall target="download-via-maven">
+ <param name="target" value="test-materials"/>
+ <param name="project-path" value="io/netty"/>
+ <param name="artifact-version" value="4.1.100.Final"/>
+ <param name="artifact-name" value="netty-handler"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ <antcall target="download-via-maven">
+ <param name="target" value="test-materials"/>
+ <param name="project-path" value="org/scala-lang/modules"/>
+ <param name="artifact-version" value="1.0.2"/>
+ <param name="artifact-name" value="scala-java8-compat_3"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ </target>
+
+ <target name="download-cleanup">
<delete>
<fileset dir="test-materials" excludes="README*.txt"/>
</delete>
- </target>
-
- <target name="calculate-testcode-condition">
- <available file="test-materials/kafka_2.11-${kafka.version}.jar"
property="tests-present"/>
- </target>
-
- <target name="pretest-warn" depends="calculate-testcode-condition"
unless="tests-present">
+ </target>
+
+ <target name="calculate-testcode-condition">
+ <available file="test-materials/kafka_2.13-${kafka.version}.jar"
property="tests-present"/>
+ </target>
+
+ <target name="pretest-warn" depends="calculate-testcode-condition"
unless="tests-present">
<echo message="Need Kafka download in order to compile tests - run ant
make-deps"/>
</target>
@@ -130,22 +193,31 @@
<path refid="mcf-connector-build.connector-test-classpath"/>
<fileset dir="../../lib">
<include name="zookeeper*.jar"/>
- <include name="kafka-clients*.jar"/>
- <include name="lz4*.jar"/>
- <include name="snappy-java*.jar"/>
- </fileset>
- <fileset dir="test-materials">
- <include name="zkclient*.jar"/>
+ <include name="kafka-clients*.jar"/>
+ <include name="lz4*.jar"/>
+ <include name="snappy-java*.jar"/>
+ <include name="metrics-core*.jar"/>
+ </fileset>
+ <fileset dir="test-materials">
+ <include name="zkclient*.jar"/>
<include name="commons-lang3*.jar"/>
- <include name="metrics-core*.jar"/>
- <include name="jopt-simple*.jar"/>
- <include name="scala-library*.jar"/>
- <include name="kafka_2.11*.jar"/>
- <include name="scala-xml_2.11*.jar"/>
- <include name="scala-parser-combinators_2.11*.jar"/>
- </fileset>
- </path>
-
+ <include name="metrics-core*.jar"/>
+ <include name="jopt-simple*.jar"/>
+ <include name="scala-library*.jar"/>
+ <include name="kafka_2.13*.jar"/>
+ <include name="kafka-server-common*.jar"/>
+ <include name="kafka-group-coordinator*.jar"/>
+ <include name="kafka-raft*.jar"/>
+ <include name="kafka-storage*.jar"/>
+ <include name="kafka-metadata*.jar"/>
+ <include name="scala-logging_3*.jar"/>
+ <include name="commons-validator*.jar"/>
+ <include name="scala-parser-combinators_2.13*.jar"/>
+ <include name="netty-handler*.jar"/>
+ <include name="scala-java8-compat_3*.jar"/>
+ </fileset>
+ </path>
+
<target name="deliver-connector"
depends="mcf-connector-build.deliver-connector">
<antcall target="general-add-output-connector">
<param name="connector-label" value="Kafka"/>
Modified:
manifoldcf/branches/release-2.26-branch/connectors/kafka/connector/src/main/java/org/apache/manifoldcf/agents/output/kafka/KafkaOutputConnector.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/release-2.26-branch/connectors/kafka/connector/src/main/java/org/apache/manifoldcf/agents/output/kafka/KafkaOutputConnector.java?rev=1913115&r1=1913114&r2=1913115&view=diff
==============================================================================
---
manifoldcf/branches/release-2.26-branch/connectors/kafka/connector/src/main/java/org/apache/manifoldcf/agents/output/kafka/KafkaOutputConnector.java
(original)
+++
manifoldcf/branches/release-2.26-branch/connectors/kafka/connector/src/main/java/org/apache/manifoldcf/agents/output/kafka/KafkaOutputConnector.java
Thu Oct 19 12:14:05 2023
@@ -130,13 +130,12 @@ public class KafkaOutputConnector extend
//System.out.println("Kafka Port: " + PORT);
props.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, IP + ":" + PORT);
props.put(ProducerConfig.RETRIES_CONFIG, "3");
- props.put(ProducerConfig.ACKS_CONFIG, "all");
- props.put(ProducerConfig.COMPRESSION_TYPE_CONFIG, "none");
- props.put(ProducerConfig.BATCH_SIZE_CONFIG, 200);
- props.put(ProducerConfig.BLOCK_ON_BUFFER_FULL_CONFIG, true);
- props.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG,
"org.apache.kafka.common.serialization.StringSerializer");
- props.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG,
"org.apache.kafka.common.serialization.ByteArraySerializer");
- producer = new KafkaProducer(props);
+ props.put(ProducerConfig.ACKS_CONFIG, "all");
+ props.put(ProducerConfig.COMPRESSION_TYPE_CONFIG, "none");
+ props.put(ProducerConfig.BATCH_SIZE_CONFIG, 200);
+ props.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG,
"org.apache.kafka.common.serialization.StringSerializer");
+ props.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG,
"org.apache.kafka.common.serialization.ByteArraySerializer");
+ producer = new KafkaProducer(props);
}
/**
Modified:
manifoldcf/branches/release-2.26-branch/connectors/kafka/connector/src/test/java/org/apache/manifoldcf/agents/output/kafka/KafkaLocal.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/release-2.26-branch/connectors/kafka/connector/src/test/java/org/apache/manifoldcf/agents/output/kafka/KafkaLocal.java?rev=1913115&r1=1913114&r2=1913115&view=diff
==============================================================================
---
manifoldcf/branches/release-2.26-branch/connectors/kafka/connector/src/test/java/org/apache/manifoldcf/agents/output/kafka/KafkaLocal.java
(original)
+++
manifoldcf/branches/release-2.26-branch/connectors/kafka/connector/src/test/java/org/apache/manifoldcf/agents/output/kafka/KafkaLocal.java
Thu Oct 19 12:14:05 2023
@@ -15,30 +15,31 @@
* limitations under the License.
*/
package org.apache.manifoldcf.agents.output.kafka;
-
-import java.io.IOException;
-import java.util.Properties;
-import kafka.server.KafkaConfig;
-import kafka.server.KafkaServerStartable;
-
-public class KafkaLocal {
-
- public KafkaServerStartable kafka;
- public ZooKeeperLocal zookeeper;
-
- public KafkaLocal(Properties kafkaProperties, Properties zkProperties)
throws IOException, InterruptedException {
+
+import java.io.IOException;
+import java.util.Properties;
+import org.apache.kafka.common.utils.Time;
+import kafka.server.KafkaConfig;
+import kafka.server.KafkaServer;
+
+public class KafkaLocal {
+
+ public KafkaServer kafka;
+ public ZooKeeperLocal zookeeper;
+
+ public KafkaLocal(Properties kafkaProperties, Properties zkProperties)
throws IOException, InterruptedException {
KafkaConfig kafkaConfig = new KafkaConfig(kafkaProperties);
//start local zookeeper
System.out.println("starting local zookeeper...");
zookeeper = new ZooKeeperLocal(zkProperties);
- System.out.println("done");
-
- //start local kafka broker
- kafka = new KafkaServerStartable(kafkaConfig);
- System.out.println("starting local kafka broker...");
-
- kafka.startup();
+ System.out.println("done");
+
+ //start local kafka broker
+ kafka = new KafkaServer(kafkaConfig, Time.SYSTEM, scala.Option.empty(),
false);
+ System.out.println("starting local kafka broker...");
+
+ kafka.startup();
System.out.println("done");
}
Modified: manifoldcf/branches/release-2.26-branch/connectors/kafka/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/release-2.26-branch/connectors/kafka/pom.xml?rev=1913115&r1=1913114&r2=1913115&view=diff
==============================================================================
--- manifoldcf/branches/release-2.26-branch/connectors/kafka/pom.xml (original)
+++ manifoldcf/branches/release-2.26-branch/connectors/kafka/pom.xml Thu Oct 19
12:14:05 2023
@@ -221,56 +221,109 @@
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.kafka</groupId>
- <artifactId>kafka-clients</artifactId>
- <version>0.8.2.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.kafka</groupId>
- <artifactId>kafka_2.11</artifactId>
- <version>0.8.2.1</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
+ <dependency>
+ <groupId>org.apache.kafka</groupId>
+ <artifactId>kafka-clients</artifactId>
+ <version>3.6.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.kafka</groupId>
+ <artifactId>kafka_2.13</artifactId>
+ <version>3.6.0</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.scala-lang</groupId>
- <artifactId>scala-library</artifactId>
- <version>2.11.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>net.sf.jopt-simple</groupId>
- <artifactId>jopt-simple</artifactId>
- <version>3.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.scala-lang.modules</groupId>
- <artifactId>scala-xml_2.11</artifactId>
- <version>1.0.4</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.scala-lang.modules</groupId>
- <artifactId>scala-parser-combinators_2.11</artifactId>
- <version>1.0.4</version>
- <scope>test</scope>
- </dependency>
- <dependency>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.kafka</groupId>
+ <artifactId>kafka-server-common</artifactId>
+ <version>3.6.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.kafka</groupId>
+ <artifactId>kafka-group-coordinator</artifactId>
+ <version>3.6.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.kafka</groupId>
+ <artifactId>kafka-raft</artifactId>
+ <version>3.6.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.kafka</groupId>
+ <artifactId>kafka-storage</artifactId>
+ <version>3.6.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.kafka</groupId>
+ <artifactId>kafka-metadata</artifactId>
+ <version>3.6.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.typesafe.scala-logging</groupId>
+ <artifactId>scala-logging_3</artifactId>
+ <version>3.9.5</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-validator</groupId>
+ <artifactId>commons-validator</artifactId>
+ <version>1.7</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-library</artifactId>
+ <version>2.13.11</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.jopt-simple</groupId>
+ <artifactId>jopt-simple</artifactId>
+ <version>5.0.4</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.scala-lang.modules</groupId>
+ <artifactId>scala-xml_2.13</artifactId>
+ <version>2.2.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.scala-lang.modules</groupId>
+ <artifactId>scala-parser-combinators_2.13</artifactId>
+ <version>2.2.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>com.yammer.metrics</groupId>
<artifactId>metrics-core</artifactId>
- <version>2.2.0</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
+ <version>2.2.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>io.dropwizard.metrics</groupId>
+ <artifactId>metrics-core</artifactId>
+ <version>4.2.21</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.scala-lang.modules</groupId>
+ <artifactId>scala-java8-compat_3</artifactId>
+ <version>1.0.2</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>mcf-agents</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
@@ -459,8 +512,14 @@
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
-</project>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-handler</artifactId>
+ <version>4.1.100.Final</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
Modified: manifoldcf/branches/release-2.26-branch/framework/core/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/release-2.26-branch/framework/core/pom.xml?rev=1913115&r1=1913114&r2=1913115&view=diff
==============================================================================
--- manifoldcf/branches/release-2.26-branch/framework/core/pom.xml (original)
+++ manifoldcf/branches/release-2.26-branch/framework/core/pom.xml Thu Oct 19
12:14:05 2023
@@ -235,7 +235,7 @@
<dependency>
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-core</artifactId>
- <version>4.1.12.1</version>
+ <version>4.2.21</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: manifoldcf/branches/release-2.26-branch/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/release-2.26-branch/pom.xml?rev=1913115&r1=1913114&r2=1913115&view=diff
==============================================================================
--- manifoldcf/branches/release-2.26-branch/pom.xml (original)
+++ manifoldcf/branches/release-2.26-branch/pom.xml Thu Oct 19 12:14:05 2023
@@ -81,11 +81,10 @@
<velocity-engine-core.version>2.3</velocity-engine-core.version>
<slf4j.version>1.7.36</slf4j.version>
<jaxb.version>2.2.6</jaxb.version>
- <zookeeper.version>3.8.0</zookeeper.version>
+ <zookeeper.version>3.9.1</zookeeper.version>
<xmlbeans.version>2.6.0</xmlbeans.version>
<poi.version>3.17</poi.version>
- <tika.version>1.28.1</tika.version>
- <boilerpipe.version>1.1.0</boilerpipe.version>
+ <tika.version>1.28.1</tika.version>
<boilerpipe.version>1.1.0</boilerpipe.version>
<hadoop.version>2.6.0</hadoop.version>
<tomcat.version>6.0.35</tomcat.version>
<ecj.version>4.3.1</ecj.version>
