Project

General

Profile

« Previous | Next » 

Revision 53806

branch for solr 7.5.0

View differences:

modules/dnet-index-client/branches/solr75/src/main/java/eu/dnetlib/functionality/index/client/solr/SolrIndexClient.java
20 20
import eu.dnetlib.functionality.index.solr.cql.SolrTypeBasedCqlValueTransformerMapFactory;
21 21
import eu.dnetlib.functionality.index.solr.feed.StreamingInputDocumentFactory;
22 22
import eu.dnetlib.functionality.index.utils.MetadataReference;
23
import eu.dnetlib.functionality.index.utils.ZkServers;
23 24
import eu.dnetlib.miscutils.datetime.HumanTime;
24 25
import eu.dnetlib.miscutils.functional.UnaryFunction;
25 26
import org.apache.commons.lang3.StringUtils;
......
222 223
		if (this.client == null) {
223 224
			String url = getUrl();
224 225
			log.debug("create new Client " + url);
225
			client = new CloudSolrClient.Builder().withZkHost(url).build();
226

  
227
			final ZkServers zk = ZkServers.newInstance(url);
228
			final CloudSolrClient client = new CloudSolrClient.Builder(zk.getHosts(), zk.getChroot()).build();
229

  
230
			client.connect();
226 231
			client.setDefaultCollection(String.format("%s-%s-%s", getFormat(), getLayout(), getInterpretation()));
227 232
			try {
228 233
				client.ping();
modules/dnet-index-client/branches/solr75/pom.xml
1 1
<?xml version="1.0" encoding="UTF-8"?>
2
<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">
3
	<parent>
4
		<groupId>eu.dnetlib</groupId>
5
		<artifactId>dnet45-parent</artifactId>
6
		<version>1.0.0-SNAPSHOT</version>
7
		<relativePath />
8
	</parent>
9
	<modelVersion>4.0.0</modelVersion>
10
	<groupId>eu.dnetlib</groupId>
11
	<artifactId>dnet-index-client</artifactId>
12
	<packaging>jar</packaging>
13
	<version>2.3.2-solr7-SNAPSHOT</version>
14
	<scm>
15
		<developerConnection>scm:svn:https://svn.driver.research-infrastructures.eu/driver/dnet45/modules/dnet-index-client/branches/solr7</developerConnection>
16
	</scm>
17
	<dependencies>
18
		<dependency>
19
			<groupId>org.springframework</groupId>
20
			<artifactId>spring-beans</artifactId>
21
			<version>${spring.version}</version>
22
		</dependency>		
23
		<dependency>
24
			<groupId>junit</groupId>
25
			<artifactId>junit</artifactId>
26
			<version>${junit.version}</version>
27
			<scope>test</scope>
28
		</dependency>
29
		<dependency>
30
			<groupId>org.mockito</groupId>
31
			<artifactId>mockito-core</artifactId>
32
			<version>${mockito.version}</version>
33
			<scope>test</scope>
34
		</dependency>
35
		<dependency>
36
			<groupId>com.google.code.gson</groupId>
37
			<artifactId>gson</artifactId>
38
			<version>${google.gson.version}</version>		
39
		</dependency>		
2
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
4
    <parent>
5
        <groupId>eu.dnetlib</groupId>
6
        <artifactId>dnet45-parent</artifactId>
7
        <version>1.0.0-SNAPSHOT</version>
8
        <relativePath/>
9
    </parent>
10
    <modelVersion>4.0.0</modelVersion>
11
    <groupId>eu.dnetlib</groupId>
12
    <artifactId>dnet-index-client</artifactId>
13
    <packaging>jar</packaging>
14
    <version>2.3.2-solr75-SNAPSHOT</version>
15
    <scm>
16
        <developerConnection>
17
            scm:svn:https://svn.driver.research-infrastructures.eu/driver/dnet45/modules/dnet-index-client/branches/solr7
18
        </developerConnection>
19
    </scm>
20
    <dependencies>
21
        <dependency>
22
            <groupId>org.springframework</groupId>
23
            <artifactId>spring-beans</artifactId>
24
            <version>${spring.version}</version>
25
        </dependency>
26
        <dependency>
27
            <groupId>junit</groupId>
28
            <artifactId>junit</artifactId>
29
            <version>${junit.version}</version>
30
            <scope>test</scope>
31
        </dependency>
32
        <dependency>
33
            <groupId>org.mockito</groupId>
34
            <artifactId>mockito-core</artifactId>
35
            <version>${mockito.version}</version>
36
            <scope>test</scope>
37
        </dependency>
38
        <dependency>
39
            <groupId>com.google.code.gson</groupId>
40
            <artifactId>gson</artifactId>
41
            <version>${google.gson.version}</version>
42
        </dependency>
40 43

  
41
		<dependency>
42
			<groupId>com.mycila</groupId>
43
			<artifactId>xmltool</artifactId>
44
			<version>3.3</version>
45
		</dependency>
46
		<dependency>
47
			<groupId>org.apache.solr</groupId>
48
			<artifactId>solr-solrj</artifactId>
49
			<version>${apache.solr.version}</version>
50
			<exclusions>
51
				<exclusion>
52
					<artifactId>wstx-asl</artifactId>
53
					<groupId>org.codehaus.woodstox</groupId>
54
				</exclusion>
55
				<exclusion>
56
					<artifactId>jcl-over-slf4j</artifactId>
57
					<groupId>org.slf4j</groupId>
58
				</exclusion>
59
			</exclusions>
60
		</dependency>
61
		<dependency>
62
		<groupId>eu.dnetlib</groupId>
63
			<artifactId>cnr-service-common</artifactId>
64
			<version>[2.1.0,3.0.0)</version>	
65
		</dependency>
66
		<dependency>
67
			<groupId>eu.dnetlib</groupId>
68
			<artifactId>cnr-cql-utils</artifactId>
69
			<version>[2.0.0,3.0.0)</version>
70
		</dependency>
71
		<dependency>
72
			<groupId>eu.dnetlib</groupId>
73
			<artifactId>dnet-data-provision-rmi</artifactId>
74
			<version>[1.0.0,2.0.0)</version>
75
		</dependency>
76
	</dependencies>
44
        <dependency>
45
            <groupId>com.mycila</groupId>
46
            <artifactId>xmltool</artifactId>
47
            <version>3.3</version>
48
        </dependency>
49
        <dependency>
50
            <groupId>org.apache.solr</groupId>
51
            <artifactId>solr-solrj</artifactId>
52
            <version>${apache.solr.version}</version>
53
            <exclusions>
54
                <exclusion>
55
                    <artifactId>wstx-asl</artifactId>
56
                    <groupId>org.codehaus.woodstox</groupId>
57
                </exclusion>
58
                <exclusion>
59
                    <artifactId>jcl-over-slf4j</artifactId>
60
                    <groupId>org.slf4j</groupId>
61
                </exclusion>
62
            </exclusions>
63
        </dependency>
64
        <dependency>
65
            <groupId>eu.dnetlib</groupId>
66
            <artifactId>dnet-index-solr-common</artifactId>
67
            <version>[2.1.0,3.0.0)</version>
68
        </dependency>
69
        <dependency>
70
            <groupId>eu.dnetlib</groupId>
71
            <artifactId>cnr-service-common</artifactId>
72
            <version>[2.1.0,3.0.0)</version>
73
        </dependency>
74
        <dependency>
75
            <groupId>eu.dnetlib</groupId>
76
            <artifactId>cnr-cql-utils</artifactId>
77
            <version>[2.0.0,3.0.0)</version>
78
        </dependency>
79
        <dependency>
80
            <groupId>eu.dnetlib</groupId>
81
            <artifactId>dnet-data-provision-rmi</artifactId>
82
            <version>[1.0.0,2.0.0)</version>
83
        </dependency>
84
    </dependencies>
77 85
</project>

Also available in: Unified diff