Modified: manifoldcf/trunk/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_en_US.properties URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_en_US.properties?rev=1910246&r1=1910245&r2=1910246&view=diff ============================================================================== --- manifoldcf/trunk/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_en_US.properties (original) +++ manifoldcf/trunk/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_en_US.properties Tue Jun 6 01:35:45 2023 @@ -38,8 +38,8 @@ SolrConnector.CoreName=Core/Collection n SolrConnector.CollectionName=Collection name: SolrConnector.ConnectionTimeout=Connection timeout (seconds): SolrConnector.SocketTimeout=Socket timeout (seconds): -SolrConnector.ZookeeperClientTimeout=ZooKeeper client timeout (seconds): -SolrConnector.ZookeeperConnectTimeout=ZooKeeper connect timeout (seconds): +SolrConnector.ZookeeperSocketTimeout=Socket timeout (seconds): +SolrConnector.ZookeeperConnectionTimeout=Connection timeout (seconds): SolrConnector.UpdateHandler=Update handler: SolrConnector.RemoveHandler=Remove handler: SolrConnector.StatusHandler=Status handler:
Modified: manifoldcf/trunk/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_es_ES.properties URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_es_ES.properties?rev=1910246&r1=1910245&r2=1910246&view=diff ============================================================================== --- manifoldcf/trunk/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_es_ES.properties (original) +++ manifoldcf/trunk/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_es_ES.properties Tue Jun 6 01:35:45 2023 @@ -38,8 +38,8 @@ SolrConnector.CoreName=Core/nombre de Co SolrConnector.CollectionName=nombre de la colección: SolrConnector.ConnectionTimeout=El tiempo de conexión expiro (segundos): SolrConnector.SocketTimeout=Socket timeout (segundos): -SolrConnector.ZookeeperClientTimeout=Tiempo de espera del cliente ZooKeeper (segundos): -SolrConnector.ZookeeperConnectTimeout=ZooKeeper tiempo de espera de conexión (segundos): +SolrConnector.ZookeeperSocketTimeout=Socket timeout (segundos): +SolrConnector.ZookeeperConnectionTimeout=El tiempo de conexión expiro (segundos): SolrConnector.UpdateHandler=actualización de controlador: SolrConnector.RemoveHandler=Retire manejador: SolrConnector.StatusHandler=manejador de Estado: Modified: manifoldcf/trunk/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_fr_FR.properties URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_fr_FR.properties?rev=1910246&r1=1910245&r2=1910246&view=diff ============================================================================== --- manifoldcf/trunk/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_fr_FR.properties (original) +++ manifoldcf/trunk/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_fr_FR.properties Tue Jun 6 01:35:45 2023 @@ -37,8 +37,8 @@ SolrConnector.CoreName=Nom de Core/Colle SolrConnector.CollectionName=Nom de Collection: SolrConnector.ConnectionTimeout=Timeout de la connexion (secondes): SolrConnector.SocketTimeout=Timoute de la Socket (secondes): -SolrConnector.ZookeeperClientTimeout=Timeout du client ZooKeeper (secondes): -SolrConnector.ZookeeperConnectTimeout=Timetout du ZooKeeper connect (secondes): +SolrConnector.ZookeeperSocketTimeout=Timeout de socket (secondes): +SolrConnector.ZookeeperConnectionTimeout=Timeout de connection (secondes): SolrConnector.UpdateHandler=Update handler: SolrConnector.RemoveHandler=Remove handler: SolrConnector.StatusHandler=Status handler: Modified: manifoldcf/trunk/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_ja_JP.properties URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_ja_JP.properties?rev=1910246&r1=1910245&r2=1910246&view=diff ============================================================================== --- manifoldcf/trunk/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_ja_JP.properties (original) +++ manifoldcf/trunk/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_ja_JP.properties Tue Jun 6 01:35:45 2023 @@ -38,8 +38,8 @@ SolrConnector.CoreName=ã³ã¢/ã SolrConnector.CollectionName=ã³ã¬ã¯ã·ã§ã³å: SolrConnector.ConnectionTimeout=ã³ãã¯ã·ã§ã³ã¿ã¤ã ã¢ã¦ãï¼ç§ï¼: SolrConnector.SocketTimeout=ã½ã±ããã¿ã¤ã ã¢ã¦ãï¼ç§ï¼: -SolrConnector.ZookeeperClientTimeout=ZooKeeperã¯ã©ã¤ã¢ã³ãã¿ã¤ã ã¢ã¦ãï¼ç§ï¼: -SolrConnector.ZookeeperConnectTimeout=ZooKeeperæ¥ç¶ã¿ã¤ã ã¢ã¦ãï¼ç§ï¼: +SolrConnector.ZookeeperSocketTimeout=ã½ã±ããã¿ã¤ã ã¢ã¦ãï¼ç§ï¼: +SolrConnector.ZookeeperConnectionTimeout=ã³ãã¯ã·ã§ã³ã¿ã¤ã ã¢ã¦ãï¼ç§ï¼: SolrConnector.UpdateHandler=æ´æ°ãã³ãã©ã¼ï¼ SolrConnector.RemoveHandler=é¤å¤ãã³ãã©ã¼ï¼ SolrConnector.StatusHandler=ç¶æ ãã³ãã©ã¼ï¼ Modified: manifoldcf/trunk/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_zh_CN.properties URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_zh_CN.properties?rev=1910246&r1=1910245&r2=1910246&view=diff ============================================================================== --- manifoldcf/trunk/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_zh_CN.properties (original) +++ manifoldcf/trunk/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_zh_CN.properties Tue Jun 6 01:35:45 2023 @@ -38,8 +38,8 @@ SolrConnector.CoreName=Core/Collectionå SolrConnector.CollectionName=Collectionå: SolrConnector.ConnectionTimeout=è¿æ¥è¶ æ¶(ç§): SolrConnector.SocketTimeout=å¥æ¥åè¶ æ¶(ç§): -SolrConnector.ZookeeperClientTimeout=ZooKeeper客æ·ç«¯è¶ æ¶(ç§): -SolrConnector.ZookeeperConnectTimeout=ZooKeeperè¿æ¥è¶ æ¶(ç§): +SolrConnector.ZookeeperSocketTimeout=å¥æ¥åè¶ æ¶(ç§): +SolrConnector.ZookeeperConnectionTimeout=è¿æ¥è¶ æ¶(ç§): SolrConnector.UpdateHandler=æ´æ°å¤çå¨: SolrConnector.RemoveHandler=æé¤å¤çå¨: SolrConnector.StatusHandler=ç¶æå¤çå¨: Modified: manifoldcf/trunk/connectors/solr/pom.xml URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/solr/pom.xml?rev=1910246&r1=1910245&r2=1910246&view=diff ============================================================================== --- manifoldcf/trunk/connectors/solr/pom.xml (original) +++ manifoldcf/trunk/connectors/solr/pom.xml Tue Jun 6 01:35:45 2023 @@ -207,37 +207,21 @@ <groupId>org.apache.solr</groupId> <artifactId>solr-solrj</artifactId> <version>${solr.version}</version> - <exclusions> - <!-- Solrj pulls in an older httpclient --> - <exclusion> - <artifactId>httpclient</artifactId> - <groupId>org.apache.httpcomponents</groupId> - </exclusion> - <exclusion> - <artifactId>httpcore</artifactId> - <groupId>org.apache.httpcomponents</groupId> - </exclusion> - <exclusion> - <artifactId>httpmime</artifactId> - <groupId>org.apache.httpcomponents</groupId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.noggit</groupId> - <artifactId>noggit</artifactId> - <version>${noggit.version}</version> + </dependency> + <dependency> + <groupId>org.apache.solr</groupId> + <artifactId>solr-solrj-zookeeper</artifactId> + <version>${solr.version}</version> </dependency> <dependency> <groupId>org.apache.zookeeper</groupId> <artifactId>zookeeper</artifactId> <version>${zookeeper.version}</version> - <exclusions> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - </exclusions> + </dependency> + <dependency> + <groupId>org.apache.zookeeper</groupId> + <artifactId>zookeeper-jute</artifactId> + <version>${zookeeper.version}</version> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> @@ -260,6 +244,24 @@ <version>${slf4j.version}</version> </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-client</artifactId> + <version>${jetty.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty.http2</groupId> + <artifactId>http2-http-client-transport</artifactId> + <version>${jetty.version}</version> + </dependency> + + + + + + + + <!-- Testing dependencies --> <dependency> @@ -341,7 +343,6 @@ <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-util</artifactId> <version>${jetty.version}</version> - <scope>test</scope> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> @@ -359,7 +360,6 @@ <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-http</artifactId> <version>${jetty.version}</version> - <scope>test</scope> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> Modified: manifoldcf/trunk/framework/build.xml URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/build.xml?rev=1910246&r1=1910245&r2=1910246&view=diff ============================================================================== --- manifoldcf/trunk/framework/build.xml (original) +++ manifoldcf/trunk/framework/build.xml Tue Jun 6 01:35:45 2023 @@ -49,6 +49,7 @@ <include name="commons-collections4-*.jar"/> <include name="commons-el*.jar"/> <include name="commons-fileupload*.jar"/> + <include name="http2*.jar"/> <include name="httpcore*.jar"/> <include name="httpclient*.jar"/> <include name="commons-io*.jar"/> @@ -737,8 +738,10 @@ <include name="commons-collections4*.jar"/> <include name="commons-el*.jar"/> <include name="commons-fileupload*.jar"/> + <include name="http2*.jar"/> <include name="httpcore*.jar"/> <include name="httpclient*.jar"/> + <include name="jetty*.jar"/> <include name="commons-io*.jar"/> <include name="commons-lang*.jar"/> <include name="commons-logging*.jar"/> @@ -799,8 +802,10 @@ <include name="commons-collections4*.jar"/> <include name="commons-el*.jar"/> <include name="commons-fileupload*.jar"/> + <include name="http2*.jar"/> <include name="httpcore*.jar"/> <include name="httpclient*.jar"/> + <include name="jetty*.jar"/> <include name="commons-io*.jar"/> <include name="commons-lang*.jar"/> <include name="commons-logging*.jar"/> @@ -1089,6 +1094,7 @@ <include name="jna*.jar"/> </fileset> <fileset dir="../lib"> + <include name="http2*.jar"/> <include name="jetty*.jar"/> <include name="javax.servlet-api*.jar"/> <include name="ecj*.jar"/> @@ -1288,7 +1294,8 @@ <path id="jetty-lib"> <fileset dir="../lib"> - <include name="jetty*.jar"/> + <include name="http2*.jar"/> + <include name="jetty*.jar"/> </fileset> </path> Modified: manifoldcf/trunk/framework/core/pom.xml URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/core/pom.xml?rev=1910246&r1=1910245&r2=1910246&view=diff ============================================================================== --- manifoldcf/trunk/framework/core/pom.xml (original) +++ manifoldcf/trunk/framework/core/pom.xml Tue Jun 6 01:35:45 2023 @@ -232,6 +232,18 @@ <version>${slf4j.version}</version> <scope>test</scope> </dependency> + <dependency> + <groupId>io.dropwizard.metrics</groupId> + <artifactId>metrics-core</artifactId> + <version>4.1.12.1</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.xerial.snappy</groupId> + <artifactId>snappy-java</artifactId> + <version>1.1.7.7</version> + <scope>test</scope> + </dependency> </dependencies> </project> Modified: manifoldcf/trunk/framework/core/src/test/java/org/apache/manifoldcf/core/lockmanager/ZooKeeperInstance.java URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/core/src/test/java/org/apache/manifoldcf/core/lockmanager/ZooKeeperInstance.java?rev=1910246&r1=1910245&r2=1910246&view=diff ============================================================================== --- manifoldcf/trunk/framework/core/src/test/java/org/apache/manifoldcf/core/lockmanager/ZooKeeperInstance.java (original) +++ manifoldcf/trunk/framework/core/src/test/java/org/apache/manifoldcf/core/lockmanager/ZooKeeperInstance.java Tue Jun 6 01:35:45 2023 @@ -18,31 +18,31 @@ */ package org.apache.manifoldcf.core.lockmanager; -import java.util.*; -import java.io.*; -import org.apache.zookeeper.server.*; -import org.apache.zookeeper.server.quorum.*; +import java.io.File; +import java.io.IOException; +import java.util.Properties; + +import org.apache.zookeeper.server.ServerConfig; +import org.apache.zookeeper.server.ZooKeeperServerMain; +import org.apache.zookeeper.server.quorum.QuorumPeerConfig; -public class ZooKeeperInstance -{ +public class ZooKeeperInstance { protected final int zkPort; protected final File tempDir; - + protected ZooKeeperThread zookeeperThread = null; - - public ZooKeeperInstance(int zkPort, File tempDir) - { + + public ZooKeeperInstance(final int zkPort, final File tempDir) { this.zkPort = zkPort; this.tempDir = tempDir; } - public void start() - throws Exception - { - Properties startupProperties = new Properties(); - startupProperties.setProperty("tickTime","2000"); - startupProperties.setProperty("dataDir",tempDir.toString()); - startupProperties.setProperty("clientPort",Integer.toString(zkPort)); + public void start() throws Exception { + final Properties startupProperties = new Properties(); + startupProperties.setProperty("tickTime", "2000"); + startupProperties.setProperty("dataDir", tempDir.toString()); + startupProperties.setProperty("clientPort", Integer.toString(zkPort)); + startupProperties.setProperty("admin.enableServer", "false"); final QuorumPeerConfig quorumConfiguration = new QuorumPeerConfig(); quorumConfiguration.parseProperties(startupProperties); @@ -53,33 +53,26 @@ public class ZooKeeperInstance zookeeperThread = new ZooKeeperThread(configuration); zookeeperThread.start(); // We have no way of knowing whether zookeeper is alive or not, but the - // client is supposed to know about that. But it doesn't, so wait for 5 seconds + // client is supposed to know about that. But it doesn't, so wait for 5 seconds Thread.sleep(5000L); } - - public void stop() - throws Exception - { - while (true) - { + + public void stop() throws Exception { + while (true) { if (zookeeperThread == null) break; - else if (!zookeeperThread.isAlive()) - { - Throwable e = zookeeperThread.finishUp(); - if (e != null) - { + else if (!zookeeperThread.isAlive()) { + final Throwable e = zookeeperThread.finishUp(); + if (e != null) { if (e instanceof RuntimeException) - throw (RuntimeException)e; + throw (RuntimeException) e; else if (e instanceof Exception) - throw (Exception)e; + throw (Exception) e; else if (e instanceof Error) - throw (Error)e; + throw (Error) e; } zookeeperThread = null; - } - else - { + } else { // This isn't the best way to kill zookeeper but it's the only way // we've got. zookeeperThread.interrupt(); @@ -87,42 +80,33 @@ public class ZooKeeperInstance } } } - - protected static class ZooKeeperThread extends Thread - { + + protected static class ZooKeeperThread extends Thread { protected final ServerConfig config; - + protected Throwable exception = null; - - public ZooKeeperThread(ServerConfig config) - { + + public ZooKeeperThread(final ServerConfig config) { this.config = config; } - - public void run() - { - try - { - ZooKeeperServerMain server = new ZooKeeperServerMain(); + + @Override + public void run() { + try { + final ZooKeeperServerMain server = new ZooKeeperServerMain(); server.runFromConfig(config); - } - catch (IOException e) - { + } catch (final IOException e) { // Ignore IOExceptions, since that seems to be normal when shutting // down zookeeper via thread.interrupt() - } - catch (Throwable e) - { + } catch (final Throwable e) { exception = e; } } - - public Throwable finishUp() - throws InterruptedException - { + + public Throwable finishUp() throws InterruptedException { join(); return exception; } } - + } Modified: manifoldcf/trunk/pom.xml URL: http://svn.apache.org/viewvc/manifoldcf/trunk/pom.xml?rev=1910246&r1=1910245&r2=1910246&view=diff ============================================================================== --- manifoldcf/trunk/pom.xml (original) +++ manifoldcf/trunk/pom.xml Tue Jun 6 01:35:45 2023 @@ -48,7 +48,7 @@ <postgresql.version>42.1.3</postgresql.version> <mysql.version>5.1.47</mysql.version> <hsqldb.version>2.3.2</hsqldb.version> - <jetty.version>9.4.25.v20191220</jetty.version> + <jetty.version>9.4.48.v20220622</jetty.version> <jetty-jsp-jdt.version>2.3.3</jetty-jsp-jdt.version> <jetty-schemas.version>3.1.M0</jetty-schemas.version> <mail.version>1.6.2</mail.version> @@ -62,10 +62,10 @@ <commons-collections.version>3.2.2</commons-collections.version> <commons-fileupload.version>1.3.3</commons-fileupload.version> <commons-discovery.version>0.5</commons-discovery.version> - <httpcomponent.httpclient.version>4.5.3</httpcomponent.httpclient.version> - <httpcomponent.httpcore.version>4.4.6</httpcomponent.httpcore.version> - <httpcomponent.httpmime.version>4.5.3</httpcomponent.httpmime.version> - <solr.version>8.3.1</solr.version> + <httpcomponent.httpclient.version>4.5.13</httpcomponent.httpclient.version> + <httpcomponent.httpcore.version>4.4.15</httpcomponent.httpcore.version> + <httpcomponent.httpmime.version>4.5.13</httpcomponent.httpmime.version> + <solr.version>9.1.0</solr.version> <noggit.version>0.8</noggit.version> <commons-el.version>1.0</commons-el.version> <commons-lang.version>2.6</commons-lang.version> @@ -79,9 +79,9 @@ <glassfish.version>2.1.v20091210</glassfish.version> <log4j.version>2.17.2</log4j.version> <velocity-engine-core.version>2.3</velocity-engine-core.version> - <slf4j.version>1.7.7</slf4j.version> + <slf4j.version>1.7.36</slf4j.version> <jaxb.version>2.2.6</jaxb.version> - <zookeeper.version>3.4.10</zookeeper.version> + <zookeeper.version>3.8.0</zookeeper.version> <xmlbeans.version>2.6.0</xmlbeans.version> <poi.version>3.17</poi.version> <tika.version>1.28.1</tika.version>
