Skip to content

Commit 8a83143

Browse files
committed
Update maven plugins versions and change compile to 1.7
(cherry picked from commit 4a3929e)
1 parent 776677f commit 8a83143

File tree

1 file changed

+24
-38
lines changed

1 file changed

+24
-38
lines changed

pom.xml

+24-38
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
<elasticsearch.version>2.0.0-SNAPSHOT</elasticsearch.version>
3636
<lucene.version>4.9.0</lucene.version>
3737
<tests.output>onerror</tests.output>
38-
<tests.jvms>1</tests.jvms>
3938
<tests.shuffle>true</tests.shuffle>
4039
<tests.output>onerror</tests.output>
4140
<tests.client.ratio></tests.client.ratio>
@@ -51,14 +50,18 @@
5150
</repositories>
5251

5352
<dependencies>
54-
5553
<dependency>
56-
<groupId>org.apache.lucene</groupId>
57-
<artifactId>lucene-test-framework</artifactId>
58-
<version>${lucene.version}</version>
54+
<groupId>org.hamcrest</groupId>
55+
<artifactId>hamcrest-core</artifactId>
56+
<version>1.3.RC2</version>
57+
<scope>test</scope>
58+
</dependency>
59+
<dependency>
60+
<groupId>org.hamcrest</groupId>
61+
<artifactId>hamcrest-library</artifactId>
62+
<version>1.3.RC2</version>
5963
<scope>test</scope>
6064
</dependency>
61-
6265
<dependency>
6366
<groupId>org.apache.lucene</groupId>
6467
<artifactId>lucene-test-framework</artifactId>
@@ -79,14 +82,6 @@
7982
<scope>provided</scope>
8083
</dependency>
8184

82-
<dependency>
83-
<groupId>org.elasticsearch</groupId>
84-
<artifactId>elasticsearch</artifactId>
85-
<version>${elasticsearch.version}</version>
86-
<type>test-jar</type>
87-
<scope>test</scope>
88-
</dependency>
89-
9085
<dependency>
9186
<groupId>com.amazonaws</groupId>
9287
<artifactId>aws-java-sdk</artifactId>
@@ -113,20 +108,6 @@
113108
<version>1.4</version>
114109
</dependency>
115110

116-
<dependency>
117-
<groupId>org.hamcrest</groupId>
118-
<artifactId>hamcrest-core</artifactId>
119-
<version>1.3.RC2</version>
120-
<scope>test</scope>
121-
</dependency>
122-
123-
<dependency>
124-
<groupId>org.hamcrest</groupId>
125-
<artifactId>hamcrest-library</artifactId>
126-
<version>1.3.RC2</version>
127-
<scope>test</scope>
128-
</dependency>
129-
130111
<dependency>
131112
<groupId>log4j</groupId>
132113
<artifactId>log4j</artifactId>
@@ -135,6 +116,14 @@
135116
<optional>true</optional>
136117
</dependency>
137118

119+
<dependency>
120+
<groupId>org.elasticsearch</groupId>
121+
<artifactId>elasticsearch</artifactId>
122+
<version>${elasticsearch.version}</version>
123+
<type>test-jar</type>
124+
<scope>test</scope>
125+
</dependency>
126+
138127
</dependencies>
139128

140129
<build>
@@ -148,10 +137,10 @@
148137
<plugin>
149138
<groupId>org.apache.maven.plugins</groupId>
150139
<artifactId>maven-compiler-plugin</artifactId>
151-
<version>2.3.2</version>
140+
<version>3.0</version>
152141
<configuration>
153-
<source>1.6</source>
154-
<target>1.6</target>
142+
<source>1.7</source>
143+
<target>1.7</target>
155144
</configuration>
156145
</plugin>
157146
<plugin>
@@ -187,7 +176,7 @@
187176
<assertions>
188177
<enable/>
189178
</assertions>
190-
<parallelism>${tests.jvms}</parallelism>
179+
<parallelism>1</parallelism>
191180
<balancers>
192181
<execution-times>
193182
<fileset dir="${basedir}" includes=".local-execution-hints.log"/>
@@ -235,9 +224,6 @@
235224
<tests.integration>${tests.integration}</tests.integration>
236225
<tests.cluster_seed>${tests.cluster_seed}</tests.cluster_seed>
237226
<tests.client.ratio>${tests.client.ratio}</tests.client.ratio>
238-
<es.node.local>${env.ES_TEST_LOCAL}</es.node.local>
239-
<es.node.mode>${es.node.mode}</es.node.mode>
240-
<es.config>${es.config}</es.config>
241227
<es.logger.level>${es.logger.level}</es.logger.level>
242228
<java.awt.headless>true</java.awt.headless>
243229
</systemProperties>
@@ -248,15 +234,15 @@
248234
<plugin>
249235
<groupId>org.apache.maven.plugins</groupId>
250236
<artifactId>maven-surefire-plugin</artifactId>
251-
<version>2.11</version>
237+
<version>2.13</version>
252238
<configuration>
253239
<skip>true</skip>
254240
</configuration>
255241
</plugin>
256242
<plugin>
257243
<groupId>org.apache.maven.plugins</groupId>
258244
<artifactId>maven-source-plugin</artifactId>
259-
<version>2.1.2</version>
245+
<version>2.2.1</version>
260246
<executions>
261247
<execution>
262248
<id>attach-sources</id>
@@ -268,7 +254,7 @@
268254
</plugin>
269255
<plugin>
270256
<artifactId>maven-assembly-plugin</artifactId>
271-
<version>2.3</version>
257+
<version>2.4</version>
272258
<configuration>
273259
<appendAssemblyId>false</appendAssemblyId>
274260
<outputDirectory>${project.build.directory}/releases/</outputDirectory>

0 commit comments

Comments
 (0)