Skip to content

Commit 15d928c

Browse files
blafondblafond
authored
Merge pull request #1679 from mbenson/pr1662
Use latest 2.x elasticsearch version 2.4.5
2 parents 9b38f5e + 5439137 commit 15d928c

File tree

5 files changed

+57
-37
lines changed

5 files changed

+57
-37
lines changed

‎index-providers/modeshape-elasticsearch-index-provider/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<url>http://www.modeshape.org</url>
1616
<properties>
1717
<!--Overwrite the default version because this version of ES uses an older Lucene version -->
18-
<version.org.apache.lucene>5.3.1</version.org.apache.lucene>
18+
<version.org.apache.lucene>5.5.4</version.org.apache.lucene>
1919
</properties>
2020
<dependencies>
2121
<dependency>

‎integration/modeshape-jbossas-integration-tests/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<preferIpv6>false</preferIpv6>
2222

2323
<!--Overwrite the default Lucene version because this version of ES uses an older Lucene version -->
24-
<version.org.apache.lucene>5.3.1</version.org.apache.lucene>
24+
<version.org.apache.lucene>5.5.4</version.org.apache.lucene>
2525
</properties>
2626
<dependencyManagement>
2727
<dependencies>
@@ -166,7 +166,7 @@
166166
<dependency>
167167
<groupId>org.elasticsearch</groupId>
168168
<artifactId>elasticsearch</artifactId>
169-
</dependency>
169+
</dependency>
170170
<dependency>
171171
<!-- JNA library needed to start ES cluster -->
172172
<groupId>net.java.dev.jna</groupId>

‎integration/modeshape-jbossas-integration-tests/src/test/assembly/es-module.xml

Lines changed: 35 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,40 @@
11
<module xmlns="urn:jboss:module:1.3" name="org.elasticsearch" slot="${version.org.elasticsearch}">
22
<resources>
3-
<resource-root path="elasticsearch-${version.org.elasticsearch}.jar" />
4-
<resource-root path="HdrHistogram-2.1.6.jar" />
5-
<resource-root path="commons-cli-1.3.1.jar" />
6-
<resource-root path="compress-lzf-1.0.2.jar" />
7-
<resource-root path="guava-18.0.jar" />
8-
<resource-root path="hppc-0.7.1.jar" />
9-
<resource-root path="joda-convert-1.2.jar" />
10-
<resource-root path="joda-time-2.8.2.jar" />
11-
<resource-root path="jsr166e-1.1.0.jar" />
12-
<resource-root path="netty-3.10.5.Final.jar" />
13-
<resource-root path="snakeyaml-1.15.jar" />
14-
<resource-root path="spatial4j-0.4.1.jar" />
15-
<resource-root path="t-digest-3.0.jar" />
16-
<resource-root path="jackson-core-2.6.2.jar" />
17-
<resource-root path="jackson-dataformat-cbor-2.6.2.jar" />
18-
<resource-root path="jackson-dataformat-yaml-2.6.2.jar" />
19-
<resource-root path="jackson-dataformat-smile-2.6.2.jar" />
20-
<resource-root path="lucene-analyzers-common-${version.org.apache.lucene}.jar" />
21-
<resource-root path="lucene-core-${version.org.apache.lucene}.jar" />
22-
<resource-root path="lucene-queries-${version.org.apache.lucene}.jar" />
23-
<resource-root path="lucene-queryparser-${version.org.apache.lucene}.jar" />
24-
<resource-root path="lucene-sandbox-${version.org.apache.lucene}.jar" />
25-
<resource-root path="lucene-join-${version.org.apache.lucene}.jar" />
26-
<resource-root path="lucene-highlighter-${version.org.apache.lucene}.jar" />
27-
<resource-root path="lucene-memory-${version.org.apache.lucene}.jar" />
28-
<resource-root path="lucene-suggest-${version.org.apache.lucene}.jar" />
29-
<resource-root path="lucene-misc-${version.org.apache.lucene}.jar" />
30-
<resource-root path="lucene-grouping-${version.org.apache.lucene}.jar" />
31-
<resource-root path="lucene-spatial-${version.org.apache.lucene}.jar" />
32-
<resource-root path="jna-${version.jna}.jar" />
3+
<resource-root path="elasticsearch.jar" />
4+
<resource-root path="HdrHistogram.jar" />
5+
<resource-root path="commons-cli.jar" />
6+
<resource-root path="compress-lzf.jar" />
7+
<resource-root path="guava.jar" />
8+
<resource-root path="hppc.jar" />
9+
<resource-root path="joda-time.jar" />
10+
<resource-root path="jsr166e.jar" />
11+
<resource-root path="netty.jar" />
12+
<resource-root path="securesm.jar" />
13+
<resource-root path="snakeyaml.jar" />
14+
<resource-root path="spatial4j.jar" />
15+
<resource-root path="t-digest.jar" />
16+
<resource-root path="jackson-core.jar" />
17+
<resource-root path="jackson-dataformat-cbor.jar" />
18+
<resource-root path="jackson-dataformat-smile.jar" />
19+
<resource-root path="jackson-dataformat-yaml.jar" />
20+
<resource-root path="lucene-analyzers-common.jar" />
21+
<resource-root path="lucene-backward-codecs.jar" />
22+
<resource-root path="lucene-core.jar" />
23+
<resource-root path="lucene-queries.jar" />
24+
<resource-root path="lucene-queryparser.jar" />
25+
<resource-root path="lucene-sandbox.jar" />
26+
<resource-root path="lucene-join.jar" />
27+
<resource-root path="lucene-highlighter.jar" />
28+
<resource-root path="lucene-memory.jar" />
29+
<resource-root path="lucene-suggest.jar" />
30+
<resource-root path="lucene-misc.jar" />
31+
<resource-root path="lucene-grouping.jar" />
32+
<resource-root path="lucene-spatial.jar" />
33+
<resource-root path="lucene-spatial3d.jar" />
34+
<resource-root path="jna.jar" />
3335
</resources>
3436
<dependencies>
35-
<module name="javax.api" export="true"/>
36-
<module name="sun.jdk" export="true"/>
37+
<module name="javax.api" export="true" />
38+
<module name="sun.jdk" export="true" />
3739
</dependencies>
38-
</module>
40+
</module>

‎integration/modeshape-jbossas-integration-tests/src/test/assembly/es-wf-kit.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
</includes>
3030
<useTransitiveFiltering>true</useTransitiveFiltering>
3131
<outputDirectory>modules/org/elasticsearch/${version.org.elasticsearch}</outputDirectory>
32+
<outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
3233
</dependencySet>
3334
</dependencySets>
3435
</assembly>

‎modeshape-parent/pom.xml

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,8 @@
201201
<version.org.wildfly>10.1.0.Final</version.org.wildfly>
202202
<version.org.wildfly.core>2.2.0.Final</version.org.wildfly.core>
203203

204+
<version.enforcer.asm>7.0</version.enforcer.asm>
205+
204206
<!-- The id of the maven distribution which is building the current wf kit -->
205207
<wf.dist.id>jboss-wf-dist</wf.dist.id>
206208

@@ -217,7 +219,7 @@
217219
<version.gwt.maven.plugin>2.5.1</version.gwt.maven.plugin>
218220
<version.org.wildfly.plugings.wildfly-maven-plugin>1.1.0.Final</version.org.wildfly.plugings.wildfly-maven-plugin>
219221
<version.fabric8.docker.plugin>0.19.0</version.fabric8.docker.plugin>
220-
<version.org.elasticsearch>2.1.0</version.org.elasticsearch>
222+
<version.org.elasticsearch>2.4.5</version.org.elasticsearch>
221223
<version.jna>4.1.0</version.jna>
222224
<!--The name of the modeshape-client artifact used by tools-->
223225
<client.artifactId>modeshape-client</client.artifactId>
@@ -838,6 +840,21 @@
838840
<artifactId>illegal-transitive-dependency-check</artifactId>
839841
<version>1.7.1</version>
840842
</dependency>
843+
<dependency>
844+
<artifactId>asm</artifactId>
845+
<groupId>org.ow2.asm</groupId>
846+
<version>${version.enforcer.asm}</version>
847+
</dependency>
848+
<dependency>
849+
<artifactId>asm-tree</artifactId>
850+
<groupId>org.ow2.asm</groupId>
851+
<version>${version.enforcer.asm}</version>
852+
</dependency>
853+
<dependency>
854+
<groupId>org.ow2.asm</groupId>
855+
<artifactId>asm-analysis</artifactId>
856+
<version>${version.enforcer.asm}</version>
857+
</dependency>
841858
</dependencies>
842859
<executions>
843860
<execution>

0 commit comments

Comments
 (0)