Skip to content

Commit 663be3b

Browse files
dadoonetdadoonet
committed
Depend on elasticsearch-parent
To simplify plugins maintenance and provide more value in the future, we are starting to build an `elasticsearch-parent` project. This commit is the first step for this plugin to depend on this new `pom` maven project.
1 parent 2b63f29 commit 663be3b

File tree

3 files changed

+75
-155
lines changed

3 files changed

+75
-155
lines changed

‎.gitignore

+3-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
.DS_Store
77
*.iml
88
/.project
9-
/.classpath
109
/.settings
11-
.local-execution-hints.log
10+
/.classpath
1211
/plugin_tools
12+
/.local-execution-hints.log
13+
/.local-*-execution-hints.log

‎dev-tools/tests.policy

+54
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
/*
2+
* Licensed to Elasticsearch under one or more contributor
3+
* license agreements. See the NOTICE file distributed with
4+
* this work for additional information regarding copyright
5+
* ownership. Elasticsearch licenses this file to you under
6+
* the Apache License, Version 2.0 (the "License"); you may
7+
* not use this file except in compliance with the License.
8+
* You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
18+
*/
19+
20+
// Policy file to prevent tests from writing outside the test sandbox directory
21+
// PLEASE NOTE: You may need to enable other permissions when new tests are added,
22+
// everything not allowed here is forbidden!
23+
24+
grant {
25+
// permissions for file access, write access only to sandbox:
26+
permission java.io.FilePermission "<<ALL FILES>>", "read,execute";
27+
permission java.io.FilePermission "${junit4.childvm.cwd}", "read,execute,write";
28+
permission java.io.FilePermission "${junit4.childvm.cwd}${/}-", "read,execute,write,delete";
29+
permission java.io.FilePermission "${junit4.tempDir}${/}*", "read,execute,write,delete";
30+
permission groovy.security.GroovyCodeSourcePermission "/groovy/script";
31+
32+
// Allow connecting to the internet anywhere
33+
permission java.net.SocketPermission "*", "accept,listen,connect,resolve";
34+
35+
// Basic permissions needed for Lucene / Elasticsearch to work:
36+
permission java.util.PropertyPermission "*", "read,write";
37+
permission java.lang.reflect.ReflectPermission "*";
38+
permission java.lang.RuntimePermission "*";
39+
40+
// These two *have* to be spelled out a separate
41+
permission java.lang.management.ManagementPermission "control";
42+
permission java.lang.management.ManagementPermission "monitor";
43+
44+
permission java.net.NetPermission "*";
45+
permission java.util.logging.LoggingPermission "control";
46+
permission javax.management.MBeanPermission "*", "*";
47+
permission javax.management.MBeanServerPermission "*";
48+
permission javax.management.MBeanTrustPermission "*";
49+
50+
// Needed for some things in DNS caching in the JVM
51+
permission java.security.SecurityPermission "getProperty.networkaddress.cache.ttl";
52+
permission java.security.SecurityPermission "getProperty.networkaddress.cache.negative.ttl";
53+
54+
};

‎pom.xml

+18-153
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,13 @@
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<modelVersion>4.0.0</modelVersion>
6+
7+
<parent>
8+
<groupId>org.elasticsearch</groupId>
9+
<artifactId>elasticsearch-parent</artifactId>
10+
<version>2.0.0-SNAPSHOT</version>
11+
</parent>
12+
613
<groupId>org.elasticsearch</groupId>
714
<artifactId>elasticsearch-lang-javascript</artifactId>
815
<version>3.0.0-SNAPSHOT</version>
@@ -20,51 +27,30 @@
2027
</licenses>
2128
<scm>
2229
<connection>scm:git:[email protected]:elasticsearch/elasticsearch-lang-javascript.git</connection>
23-
<developerConnection>scm:git:[email protected]:elasticsearch/elasticsearch-lang-javascript.git
24-
</developerConnection>
30+
<developerConnection>scm:git:[email protected]:elasticsearch/elasticsearch-lang-javascript.git</developerConnection>
2531
<url>http://github.com/elasticsearch/elasticsearch-lang-javascript</url>
2632
</scm>
2733

28-
<parent>
29-
<groupId>org.sonatype.oss</groupId>
30-
<artifactId>oss-parent</artifactId>
31-
<version>7</version>
32-
</parent>
33-
3434
<properties>
35-
<elasticsearch.version>2.0.0-SNAPSHOT</elasticsearch.version>
36-
<lucene.version>5.0.0</lucene.version>
37-
<lucene.maven.version>5.0.0-snapshot-1642891</lucene.maven.version>
38-
<tests.jvms>1</tests.jvms>
39-
<tests.shuffle>true</tests.shuffle>
40-
<tests.output>onerror</tests.output>
41-
<tests.client.ratio></tests.client.ratio>
42-
<es.logger.level>INFO</es.logger.level>
35+
<!-- You can add any specific project property here -->
4336
</properties>
4437

45-
<repositories>
46-
<repository>
47-
<id>Lucene snapshots</id>
48-
<url>https://download.elasticsearch.org/lucenesnapshots/1642891/</url>
49-
</repository>
50-
<repository>
51-
<id>sonatype</id>
52-
<url>http://oss.sonatype.org/content/repositories/releases/</url>
53-
</repository>
54-
</repositories>
55-
5638
<dependencies>
39+
<dependency>
40+
<groupId>org.hamcrest</groupId>
41+
<artifactId>hamcrest-all</artifactId>
42+
</dependency>
43+
<dependency>
44+
<groupId>com.carrotsearch.randomizedtesting</groupId>
45+
<artifactId>randomizedtesting-runner</artifactId>
46+
</dependency>
5747
<dependency>
5848
<groupId>org.apache.lucene</groupId>
5949
<artifactId>lucene-test-framework</artifactId>
60-
<version>${lucene.maven.version}</version>
61-
<scope>test</scope>
6250
</dependency>
63-
6451
<dependency>
6552
<groupId>org.elasticsearch</groupId>
6653
<artifactId>elasticsearch</artifactId>
67-
<version>${elasticsearch.version}</version>
6854
</dependency>
6955

7056
<dependency>
@@ -78,37 +64,13 @@
7864
<dependency>
7965
<groupId>log4j</groupId>
8066
<artifactId>log4j</artifactId>
81-
<version>1.2.16</version>
82-
<scope>runtime</scope>
8367
<optional>true</optional>
8468
</dependency>
8569

8670
<dependency>
8771
<groupId>org.elasticsearch</groupId>
8872
<artifactId>elasticsearch</artifactId>
89-
<version>${elasticsearch.version}</version>
9073
<type>test-jar</type>
91-
<scope>test</scope>
92-
</dependency>
93-
94-
<dependency>
95-
<groupId>org.hamcrest</groupId>
96-
<artifactId>hamcrest-core</artifactId>
97-
<version>1.3.RC2</version>
98-
<scope>test</scope>
99-
</dependency>
100-
101-
<dependency>
102-
<groupId>org.hamcrest</groupId>
103-
<artifactId>hamcrest-library</artifactId>
104-
<version>1.3.RC2</version>
105-
<scope>test</scope>
106-
</dependency>
107-
<dependency>
108-
<groupId>com.carrotsearch.randomizedtesting</groupId>
109-
<artifactId>randomizedtesting-runner</artifactId>
110-
<version>2.1.10</version>
111-
<scope>test</scope>
11274
</dependency>
11375
</dependencies>
11476

@@ -126,120 +88,23 @@
12688
<plugin>
12789
<groupId>org.apache.maven.plugins</groupId>
12890
<artifactId>maven-compiler-plugin</artifactId>
129-
<version>2.3.2</version>
130-
<configuration>
131-
<source>1.7</source>
132-
<target>1.7</target>
133-
</configuration>
13491
</plugin>
13592
<plugin>
13693
<groupId>com.carrotsearch.randomizedtesting</groupId>
13794
<artifactId>junit4-maven-plugin</artifactId>
138-
<version>2.0.12</version>
139-
<executions>
140-
<execution>
141-
<id>tests</id>
142-
<phase>test</phase>
143-
<goals>
144-
<goal>junit4</goal>
145-
</goals>
146-
<configuration>
147-
<heartbeat>20</heartbeat>
148-
<jvmOutputAction>pipe,warn</jvmOutputAction>
149-
<leaveTemporary>true</leaveTemporary>
150-
<listeners>
151-
<report-ant-xml mavenExtensions="true"
152-
dir="${project.build.directory}/surefire-reports"/>
153-
<report-text
154-
showThrowable="true"
155-
showStackTraces="true"
156-
showOutput="${tests.output}"
157-
showStatusOk="false"
158-
showStatusError="true"
159-
showStatusFailure="true"
160-
showStatusIgnored="true"
161-
showSuiteSummary="true"
162-
timestamps="false"/>
163-
<report-execution-times file="${basedir}/.local-execution-hints.log"/>
164-
</listeners>
165-
<assertions>
166-
<enable/>
167-
</assertions>
168-
<parallelism>${tests.jvms}</parallelism>
169-
<balancers>
170-
<execution-times>
171-
<fileset dir="${basedir}" includes=".local-execution-hints.log"/>
172-
</execution-times>
173-
</balancers>
174-
<includes>
175-
<include>**/*Tests.class</include>
176-
<include>**/*Test.class</include>
177-
</includes>
178-
<excludes>
179-
<exclude>**/Abstract*.class</exclude>
180-
<exclude>**/*StressTest.class</exclude>
181-
</excludes>
182-
<jvmArgs>
183-
<param>-Xmx512m</param>
184-
<param>-XX:MaxDirectMemorySize=512m</param>
185-
<param>-Des.logger.prefix=</param>
186-
</jvmArgs>
187-
<shuffleOnSlave>${tests.shuffle}</shuffleOnSlave>
188-
<sysouts>${tests.verbose}</sysouts>
189-
<seed>${tests.seed}</seed>
190-
<haltOnFailure>${tests.failfast}</haltOnFailure>
191-
<systemProperties>
192-
<!-- RandomizedTesting library system properties -->
193-
<tests.iters>${tests.iters}</tests.iters>
194-
<tests.maxfailures>${tests.maxfailures}</tests.maxfailures>
195-
<tests.failfast>${tests.failfast}</tests.failfast>
196-
<tests.class>${tests.class}</tests.class>
197-
<tests.method>${tests.method}</tests.method>
198-
<tests.nightly>${tests.nightly}</tests.nightly>
199-
<tests.badapples>${tests.badapples}</tests.badapples>
200-
<tests.weekly>${tests.weekly}</tests.weekly>
201-
<tests.slow>${tests.slow}</tests.slow>
202-
<tests.awaitsfix>${tests.awaitsfix}</tests.awaitsfix>
203-
<tests.slow>${tests.slow}</tests.slow>
204-
<tests.timeoutSuite>${tests.timeoutSuite}</tests.timeoutSuite>
205-
<tests.showSuccess>${tests.showSuccess}</tests.showSuccess>
206-
<tests.integration>${tests.integration}</tests.integration>
207-
<tests.cluster_seed>${tests.cluster_seed}</tests.cluster_seed>
208-
<tests.client.ratio>${tests.client.ratio}</tests.client.ratio>
209-
<es.node.local>${env.ES_TEST_LOCAL}</es.node.local>
210-
<es.node.mode>${es.node.mode}</es.node.mode>
211-
<es.logger.level>${es.logger.level}</es.logger.level>
212-
<java.awt.headless>true</java.awt.headless>
213-
</systemProperties>
214-
</configuration>
215-
</execution>
216-
</executions>
21795
</plugin>
21896
<plugin>
21997
<!-- we skip surefire to work with randomized testing above -->
22098
<groupId>org.apache.maven.plugins</groupId>
22199
<artifactId>maven-surefire-plugin</artifactId>
222-
<version>2.15</version>
223-
<configuration>
224-
<skipTests>true</skipTests>
225-
</configuration>
226100
</plugin>
227101
<plugin>
228102
<groupId>org.apache.maven.plugins</groupId>
229103
<artifactId>maven-source-plugin</artifactId>
230-
<version>2.1.2</version>
231-
<executions>
232-
<execution>
233-
<id>attach-sources</id>
234-
<goals>
235-
<goal>jar</goal>
236-
</goals>
237-
</execution>
238-
</executions>
239104
</plugin>
240105
<plugin>
106+
<groupId>org.apache.maven.plugins</groupId>
241107
<artifactId>maven-assembly-plugin</artifactId>
242-
<version>2.3</version>
243108
<configuration>
244109
<appendAssemblyId>false</appendAssemblyId>
245110
<outputDirectory>${project.build.directory}/releases/</outputDirectory>

0 commit comments

Comments
 (0)