|
35 | 35 | <elasticsearch.version>2.0.0-SNAPSHOT</elasticsearch.version>
|
36 | 36 | <lucene.version>4.9.0</lucene.version>
|
37 | 37 | <tests.output>onerror</tests.output>
|
38 |
| - <tests.jvms>1</tests.jvms> |
39 | 38 | <tests.shuffle>true</tests.shuffle>
|
40 | 39 | <tests.output>onerror</tests.output>
|
41 | 40 | <tests.client.ratio></tests.client.ratio>
|
|
51 | 50 | </repositories>
|
52 | 51 |
|
53 | 52 | <dependencies>
|
54 |
| - |
55 | 53 | <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> |
59 | 63 | <scope>test</scope>
|
60 | 64 | </dependency>
|
61 |
| - |
62 | 65 | <dependency>
|
63 | 66 | <groupId>org.apache.lucene</groupId>
|
64 | 67 | <artifactId>lucene-test-framework</artifactId>
|
|
79 | 82 | <scope>provided</scope>
|
80 | 83 | </dependency>
|
81 | 84 |
|
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 |
| - |
90 | 85 | <dependency>
|
91 | 86 | <groupId>com.amazonaws</groupId>
|
92 | 87 | <artifactId>aws-java-sdk</artifactId>
|
|
113 | 108 | <version>1.4</version>
|
114 | 109 | </dependency>
|
115 | 110 |
|
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 |
| - |
130 | 111 | <dependency>
|
131 | 112 | <groupId>log4j</groupId>
|
132 | 113 | <artifactId>log4j</artifactId>
|
|
135 | 116 | <optional>true</optional>
|
136 | 117 | </dependency>
|
137 | 118 |
|
| 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 | + |
138 | 127 | </dependencies>
|
139 | 128 |
|
140 | 129 | <build>
|
|
148 | 137 | <plugin>
|
149 | 138 | <groupId>org.apache.maven.plugins</groupId>
|
150 | 139 | <artifactId>maven-compiler-plugin</artifactId>
|
151 |
| - <version>2.3.2</version> |
| 140 | + <version>3.0</version> |
152 | 141 | <configuration>
|
153 |
| - <source>1.6</source> |
154 |
| - <target>1.6</target> |
| 142 | + <source>1.7</source> |
| 143 | + <target>1.7</target> |
155 | 144 | </configuration>
|
156 | 145 | </plugin>
|
157 | 146 | <plugin>
|
|
187 | 176 | <assertions>
|
188 | 177 | <enable/>
|
189 | 178 | </assertions>
|
190 |
| - <parallelism>${tests.jvms}</parallelism> |
| 179 | + <parallelism>1</parallelism> |
191 | 180 | <balancers>
|
192 | 181 | <execution-times>
|
193 | 182 | <fileset dir="${basedir}" includes=".local-execution-hints.log"/>
|
|
235 | 224 | <tests.integration>${tests.integration}</tests.integration>
|
236 | 225 | <tests.cluster_seed>${tests.cluster_seed}</tests.cluster_seed>
|
237 | 226 | <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> |
241 | 227 | <es.logger.level>${es.logger.level}</es.logger.level>
|
242 | 228 | <java.awt.headless>true</java.awt.headless>
|
243 | 229 | </systemProperties>
|
|
248 | 234 | <plugin>
|
249 | 235 | <groupId>org.apache.maven.plugins</groupId>
|
250 | 236 | <artifactId>maven-surefire-plugin</artifactId>
|
251 |
| - <version>2.11</version> |
| 237 | + <version>2.13</version> |
252 | 238 | <configuration>
|
253 | 239 | <skip>true</skip>
|
254 | 240 | </configuration>
|
255 | 241 | </plugin>
|
256 | 242 | <plugin>
|
257 | 243 | <groupId>org.apache.maven.plugins</groupId>
|
258 | 244 | <artifactId>maven-source-plugin</artifactId>
|
259 |
| - <version>2.1.2</version> |
| 245 | + <version>2.2.1</version> |
260 | 246 | <executions>
|
261 | 247 | <execution>
|
262 | 248 | <id>attach-sources</id>
|
|
268 | 254 | </plugin>
|
269 | 255 | <plugin>
|
270 | 256 | <artifactId>maven-assembly-plugin</artifactId>
|
271 |
| - <version>2.3</version> |
| 257 | + <version>2.4</version> |
272 | 258 | <configuration>
|
273 | 259 | <appendAssemblyId>false</appendAssemblyId>
|
274 | 260 | <outputDirectory>${project.build.directory}/releases/</outputDirectory>
|
|
0 commit comments