Author: kwright
Date: Tue Jun 6 01:35:45 2023
New Revision: 1910246
URL: http://svn.apache.org/viewvc?rev=1910246&view=rev
Log:
Merge CONNECTORS-1740 branch.
Added:
manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedCloudHttp2SolrClient.java
- copied unchanged from r1910244,
manifoldcf/branches/CONNECTORS-1740/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedCloudHttp2SolrClient.java
manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedCloudSolrClient.java
- copied unchanged from r1910244,
manifoldcf/branches/CONNECTORS-1740/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedCloudSolrClient.java
manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedHttp2ClusterStateProvider.java
- copied unchanged from r1910244,
manifoldcf/branches/CONNECTORS-1740/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedHttp2ClusterStateProvider.java
manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedHttp2SolrClient.java
- copied, changed from r1910244,
manifoldcf/branches/CONNECTORS-1740/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedHttp2SolrClient.java
manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedHttpClientBuilderFactory.java
- copied unchanged from r1910244,
manifoldcf/branches/CONNECTORS-1740/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedHttpClientBuilderFactory.java
manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedKrb5HttpClientBuilder.java
- copied unchanged from r1910244,
manifoldcf/branches/CONNECTORS-1740/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedKrb5HttpClientBuilder.java
manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedLBHttp2SolrClient.java
- copied unchanged from r1910244,
manifoldcf/branches/CONNECTORS-1740/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedLBHttp2SolrClient.java
manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedLBSolrClient.java
- copied unchanged from r1910244,
manifoldcf/branches/CONNECTORS-1740/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedLBSolrClient.java
manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedPreemptiveBasicAuthClientBuilderFactory.java
- copied unchanged from r1910244,
manifoldcf/branches/CONNECTORS-1740/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedPreemptiveBasicAuthClientBuilderFactory.java
manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedUpdateRequest.java
- copied unchanged from r1910244,
manifoldcf/branches/CONNECTORS-1740/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedUpdateRequest.java
Removed:
manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedHttpMultipart.java
manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedHttpSolrClient.java
manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedLBHttpSolrClient.java
manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedMultipartEntity.java
manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/PreemptiveBasicAuthInterceptor.java
manifoldcf/trunk/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/PreemptiveBasicAuthInterceptorTest.java
Modified:
manifoldcf/trunk/ (props changed)
manifoldcf/trunk/build.xml
manifoldcf/trunk/connectors/solr/build.xml
manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java
manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConfig.java
manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java
manifoldcf/trunk/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_en_US.properties
manifoldcf/trunk/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_es_ES.properties
manifoldcf/trunk/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_fr_FR.properties
manifoldcf/trunk/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_ja_JP.properties
manifoldcf/trunk/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_zh_CN.properties
manifoldcf/trunk/connectors/solr/pom.xml
manifoldcf/trunk/framework/build.xml
manifoldcf/trunk/framework/core/pom.xml
manifoldcf/trunk/framework/core/src/test/java/org/apache/manifoldcf/core/lockmanager/ZooKeeperInstance.java
manifoldcf/trunk/pom.xml
Propchange: manifoldcf/trunk/
------------------------------------------------------------------------------
Merged /manifoldcf/branches/CONNECTORS-1740:r1905688-1910244
Modified: manifoldcf/trunk/build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/build.xml?rev=1910246&r1=1910245&r2=1910246&view=diff
==============================================================================
--- manifoldcf/trunk/build.xml (original)
+++ manifoldcf/trunk/build.xml Tue Jun 6 01:35:45 2023
@@ -31,12 +31,12 @@
<property name="javax-activation.version" value="1.2.0"/>
<property name="hsqldb.version" value="2.3.2"/>
- <property name="jetty.version" value="9.4.25.v20191220"/>
+ <property name="jetty.version" value="9.4.48.v20220622"/>
<property name="httpclient.version" value="4.5.13"/>
<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.4.10"/>
+ <property name="zookeeper.version" value="3.5.6"/>
<property name="mongodb.version" value="2.14.3"/>
<property name="postgresql.version" value="42.1.3"/>
<property name="axis.version" value="1.4"/>
@@ -84,7 +84,7 @@
<property name="jakarta.annotation-api.version" value="1.3.4"/>
<property name="jakarta.jws-api.version" value="1.1.1"/>
<property name="ha-api.version" value="3.1.12"/>
- <property name="solrj.version" value="8.3.1"/>
+ <property name="solrj.version" value="9.1.0"/>
<property name="noggit.version" value="0.8"/>
<property name="commons-math3.version" value="3.6.1"/>
<property name="chemistry.version" value="1.1.0"/>
@@ -1421,10 +1421,35 @@ Use Apache Forrest version forrest-0.9-d
<target name="download-jetty">
<mkdir dir="lib"/>
<property name="jetty-package" value="org/eclipse/jetty"/>
+ <property name="jetty-http2-package" value="org/eclipse/jetty/http2"/>
<antcall target="download-via-maven"><param name="project-path"
value="${jetty-package}"/><param name="artifact-version"
value="9.2.30.v20200428"/><param name="target" value="lib"/>
<param name="artifact-name" value="jetty-jsp"/>
<param name="artifact-type" value="jar"/>
</antcall>
+ <antcall target="download-via-maven"><param name="project-path"
value="${jetty-http2-package}"/><param name="artifact-version"
value="${jetty.version}"/><param name="target" value="lib"/>
+ <param name="artifact-name" value="http2-client"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ <antcall target="download-via-maven"><param name="project-path"
value="${jetty-http2-package}"/><param name="artifact-version"
value="${jetty.version}"/><param name="target" value="lib"/>
+ <param name="artifact-name" value="http2-common"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ <antcall target="download-via-maven"><param name="project-path"
value="${jetty-http2-package}"/><param name="artifact-version"
value="${jetty.version}"/><param name="target" value="lib"/>
+ <param name="artifact-name" value="http2-hpack"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ <antcall target="download-via-maven"><param name="project-path"
value="${jetty-http2-package}"/><param name="artifact-version"
value="${jetty.version}"/><param name="target" value="lib"/>
+ <param name="artifact-name" value="http2-http-client-transport"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ <antcall target="download-via-maven"><param name="project-path"
value="${jetty-package}"/><param name="artifact-version"
value="${jetty.version}"/><param name="target" value="lib"/>
+ <param name="artifact-name" value="jetty-alpn-client"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ <antcall target="download-via-maven"><param name="project-path"
value="${jetty-package}"/><param name="artifact-version"
value="${jetty.version}"/><param name="target" value="lib"/>
+ <param name="artifact-name" value="jetty-alpn-java-client"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
<antcall target="download-via-maven"><param name="project-path"
value="${jetty-package}"/><param name="artifact-version"
value="${jetty.version}"/><param name="target" value="lib"/>
<param name="artifact-name" value="jetty-client"/>
<param name="artifact-type" value="jar"/>
@@ -2442,6 +2467,13 @@ Use Apache Forrest version forrest-0.9-d
</antcall>
<antcall target="download-via-maven">
<param name="target" value="lib"/>
+ <param name="project-path" value="org/apache/solr"/>
+ <param name="artifact-version" value="${solrj.version}"/>
+ <param name="artifact-name" value="solr-solrj-zookeeper"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ <antcall target="download-via-maven">
+ <param name="target" value="lib"/>
<param name="project-path" value="org/noggit"/>
<param name="artifact-version" value="${noggit.version}"/>
<param name="artifact-name" value="noggit"/>
@@ -2465,6 +2497,13 @@ Use Apache Forrest version forrest-0.9-d
<param name="artifact-name" value="zookeeper"/>
<param name="artifact-type" value="jar"/>
</antcall>
+ <antcall target="download-via-maven">
+ <param name="target" value="lib"/>
+ <param name="project-path" value="org/apache/zookeeper"/>
+ <param name="artifact-version" value="${zookeeper.version}"/>
+ <param name="artifact-name" value="zookeeper-jute"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
</target>
<target name="download-commons-exec">
Modified: manifoldcf/trunk/connectors/solr/build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/solr/build.xml?rev=1910246&r1=1910245&r2=1910246&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/solr/build.xml (original)
+++ manifoldcf/trunk/connectors/solr/build.xml Tue Jun 6 01:35:45 2023
@@ -34,11 +34,12 @@
<path refid="mcf-connector-build.connector-classpath"/>
<fileset dir="../../lib">
<include name="solr-solrj*.jar"/>
+ <include name="http2*.jar"/>
+ <include name="httpmime*.jar"/>
+ <include name="jetty-client*.jar"/>
+ <include name="jetty-http*.jar"/>
+ <include name="jetty-util*.jar"/>
<include name="commons-math3*.jar"/>
- <include name="noggit*.jar"/>
- <include name="httpmime*.jar"/>
- <include name="woodstox-core-asl*.jar"/>
- <include name="stax2-api*.jar"/>
<include name="jcl-over-slf4j*.jar"/>
</fileset>
</path>
@@ -49,10 +50,6 @@
<fileset dir="../../lib">
<include name="solr-solrj*.jar"/>
<include name="commons-math3*.jar"/>
- <include name="noggit*.jar"/>
- <include name="httpmime*.jar"/>
- <include name="woodstox-core-asl*.jar"/>
- <include name="stax2-api*.jar"/>
<include name="jcl-over-slf4j*.jar"/>
</fileset>
</copy>
