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.
This commit is contained in:
David Pilato
parent
d01d7fa09f
commit
33db1aebcd
|
|
@ -8,5 +8,6 @@
|
||||||
/.project
|
/.project
|
||||||
/.settings
|
/.settings
|
||||||
/.classpath
|
/.classpath
|
||||||
/.local-execution-hints.log
|
|
||||||
/plugin_tools
|
/plugin_tools
|
||||||
|
/.local-execution-hints.log
|
||||||
|
/.local-*-execution-hints.log
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,54 @@
|
||||||
|
/*
|
||||||
|
* Licensed to Elasticsearch under one or more contributor
|
||||||
|
* license agreements. See the NOTICE file distributed with
|
||||||
|
* this work for additional information regarding copyright
|
||||||
|
* ownership. Elasticsearch licenses this file to you under
|
||||||
|
* the Apache License, Version 2.0 (the "License"); you may
|
||||||
|
* not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing,
|
||||||
|
* software distributed under the License is distributed on an
|
||||||
|
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||||
|
* KIND, either express or implied. See the License for the
|
||||||
|
* specific language governing permissions and limitations
|
||||||
|
* under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
// Policy file to prevent tests from writing outside the test sandbox directory
|
||||||
|
// PLEASE NOTE: You may need to enable other permissions when new tests are added,
|
||||||
|
// everything not allowed here is forbidden!
|
||||||
|
|
||||||
|
grant {
|
||||||
|
// permissions for file access, write access only to sandbox:
|
||||||
|
permission java.io.FilePermission "<<ALL FILES>>", "read,execute";
|
||||||
|
permission java.io.FilePermission "${junit4.childvm.cwd}", "read,execute,write";
|
||||||
|
permission java.io.FilePermission "${junit4.childvm.cwd}${/}-", "read,execute,write,delete";
|
||||||
|
permission java.io.FilePermission "${junit4.tempDir}${/}*", "read,execute,write,delete";
|
||||||
|
permission groovy.security.GroovyCodeSourcePermission "/groovy/script";
|
||||||
|
|
||||||
|
// Allow connecting to the internet anywhere
|
||||||
|
permission java.net.SocketPermission "*", "accept,listen,connect,resolve";
|
||||||
|
|
||||||
|
// Basic permissions needed for Lucene / Elasticsearch to work:
|
||||||
|
permission java.util.PropertyPermission "*", "read,write";
|
||||||
|
permission java.lang.reflect.ReflectPermission "*";
|
||||||
|
permission java.lang.RuntimePermission "*";
|
||||||
|
|
||||||
|
// These two *have* to be spelled out a separate
|
||||||
|
permission java.lang.management.ManagementPermission "control";
|
||||||
|
permission java.lang.management.ManagementPermission "monitor";
|
||||||
|
|
||||||
|
permission java.net.NetPermission "*";
|
||||||
|
permission java.util.logging.LoggingPermission "control";
|
||||||
|
permission javax.management.MBeanPermission "*", "*";
|
||||||
|
permission javax.management.MBeanServerPermission "*";
|
||||||
|
permission javax.management.MBeanTrustPermission "*";
|
||||||
|
|
||||||
|
// Needed for some things in DNS caching in the JVM
|
||||||
|
permission java.security.SecurityPermission "getProperty.networkaddress.cache.ttl";
|
||||||
|
permission java.security.SecurityPermission "getProperty.networkaddress.cache.negative.ttl";
|
||||||
|
|
||||||
|
};
|
||||||
154
pom.xml
154
pom.xml
|
|
@ -3,6 +3,13 @@
|
||||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
<parent>
|
||||||
|
<groupId>org.elasticsearch</groupId>
|
||||||
|
<artifactId>elasticsearch-parent</artifactId>
|
||||||
|
<version>2.0.0-SNAPSHOT</version>
|
||||||
|
</parent>
|
||||||
|
|
||||||
<groupId>org.elasticsearch</groupId>
|
<groupId>org.elasticsearch</groupId>
|
||||||
<artifactId>elasticsearch-analysis-kuromoji</artifactId>
|
<artifactId>elasticsearch-analysis-kuromoji</artifactId>
|
||||||
<version>3.0.0-SNAPSHOT</version>
|
<version>3.0.0-SNAPSHOT</version>
|
||||||
|
|
@ -20,92 +27,46 @@
|
||||||
</licenses>
|
</licenses>
|
||||||
<scm>
|
<scm>
|
||||||
<connection>scm:git:git@github.com:elasticsearch/elasticsearch-analysis-kuromoji.git</connection>
|
<connection>scm:git:git@github.com:elasticsearch/elasticsearch-analysis-kuromoji.git</connection>
|
||||||
<developerConnection>scm:git:git@github.com:elasticsearch/elasticsearch-analysis-kuromoji.git
|
<developerConnection>scm:git:git@github.com:elasticsearch/elasticsearch-analysis-kuromoji.git</developerConnection>
|
||||||
</developerConnection>
|
|
||||||
<url>http://github.com/elasticsearch/elasticsearch-analysis-kuromoji</url>
|
<url>http://github.com/elasticsearch/elasticsearch-analysis-kuromoji</url>
|
||||||
</scm>
|
</scm>
|
||||||
|
|
||||||
<parent>
|
|
||||||
<groupId>org.sonatype.oss</groupId>
|
|
||||||
<artifactId>oss-parent</artifactId>
|
|
||||||
<version>7</version>
|
|
||||||
</parent>
|
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<elasticsearch.version>2.0.0-SNAPSHOT</elasticsearch.version>
|
<!-- You can add any specific project property here -->
|
||||||
<lucene.version>5.0.0</lucene.version>
|
|
||||||
<lucene.maven.version>5.0.0-snapshot-1642891</lucene.maven.version>
|
|
||||||
<tests.jvms>1</tests.jvms>
|
|
||||||
<tests.shuffle>true</tests.shuffle>
|
|
||||||
<tests.output>onerror</tests.output>
|
|
||||||
<tests.client.ratio></tests.client.ratio>
|
|
||||||
<es.logger.level>INFO</es.logger.level>
|
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<repositories>
|
|
||||||
<repository>
|
|
||||||
<id>Lucene snapshots</id>
|
|
||||||
<url>https://download.elasticsearch.org/lucenesnapshots/1642891/</url>
|
|
||||||
</repository>
|
|
||||||
<repository>
|
|
||||||
<id>sonatype</id>
|
|
||||||
<url>http://oss.sonatype.org/content/repositories/releases/</url>
|
|
||||||
</repository>
|
|
||||||
</repositories>
|
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.hamcrest</groupId>
|
<groupId>org.hamcrest</groupId>
|
||||||
<artifactId>hamcrest-all</artifactId>
|
<artifactId>hamcrest-all</artifactId>
|
||||||
<version>1.3</version>
|
|
||||||
<scope>test</scope>
|
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.carrotsearch.randomizedtesting</groupId>
|
<groupId>com.carrotsearch.randomizedtesting</groupId>
|
||||||
<artifactId>randomizedtesting-runner</artifactId>
|
<artifactId>randomizedtesting-runner</artifactId>
|
||||||
<version>2.1.10</version>
|
|
||||||
<scope>test</scope>
|
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.apache.lucene</groupId>
|
<groupId>org.apache.lucene</groupId>
|
||||||
<artifactId>lucene-test-framework</artifactId>
|
<artifactId>lucene-test-framework</artifactId>
|
||||||
<version>${lucene.maven.version}</version>
|
|
||||||
<scope>test</scope>
|
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.elasticsearch</groupId>
|
<groupId>org.elasticsearch</groupId>
|
||||||
<artifactId>elasticsearch</artifactId>
|
<artifactId>elasticsearch</artifactId>
|
||||||
<version>${elasticsearch.version}</version>
|
|
||||||
<scope>compile</scope>
|
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.apache.lucene</groupId>
|
<groupId>org.apache.lucene</groupId>
|
||||||
<artifactId>lucene-analyzers-kuromoji</artifactId>
|
<artifactId>lucene-analyzers-kuromoji</artifactId>
|
||||||
<version>${lucene.maven.version}</version>
|
|
||||||
<scope>compile</scope>
|
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>log4j</groupId>
|
<groupId>log4j</groupId>
|
||||||
<artifactId>log4j</artifactId>
|
<artifactId>log4j</artifactId>
|
||||||
<version>1.2.17</version>
|
|
||||||
<scope>runtime</scope>
|
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.elasticsearch</groupId>
|
<groupId>org.elasticsearch</groupId>
|
||||||
<artifactId>elasticsearch</artifactId>
|
<artifactId>elasticsearch</artifactId>
|
||||||
<version>${elasticsearch.version}</version>
|
|
||||||
<type>test-jar</type>
|
<type>test-jar</type>
|
||||||
<scope>test</scope>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.hamcrest</groupId>
|
|
||||||
<artifactId>hamcrest-core</artifactId>
|
|
||||||
<version>1.3</version>
|
|
||||||
<scope>test</scope>
|
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
|
|
@ -140,116 +101,19 @@
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-compiler-plugin</artifactId>
|
<artifactId>maven-compiler-plugin</artifactId>
|
||||||
<version>2.3.2</version>
|
|
||||||
<configuration>
|
|
||||||
<source>1.7</source>
|
|
||||||
<target>1.7</target>
|
|
||||||
</configuration>
|
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>com.carrotsearch.randomizedtesting</groupId>
|
<groupId>com.carrotsearch.randomizedtesting</groupId>
|
||||||
<artifactId>junit4-maven-plugin</artifactId>
|
<artifactId>junit4-maven-plugin</artifactId>
|
||||||
<version>2.0.12</version>
|
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<id>tests</id>
|
|
||||||
<phase>test</phase>
|
|
||||||
<goals>
|
|
||||||
<goal>junit4</goal>
|
|
||||||
</goals>
|
|
||||||
<configuration>
|
|
||||||
<heartbeat>20</heartbeat>
|
|
||||||
<jvmOutputAction>pipe,warn</jvmOutputAction>
|
|
||||||
<leaveTemporary>true</leaveTemporary>
|
|
||||||
<listeners>
|
|
||||||
<report-ant-xml mavenExtensions="true"
|
|
||||||
dir="${project.build.directory}/surefire-reports"/>
|
|
||||||
<report-text
|
|
||||||
showThrowable="true"
|
|
||||||
showStackTraces="true"
|
|
||||||
showOutput="${tests.output}"
|
|
||||||
showStatusOk="false"
|
|
||||||
showStatusError="true"
|
|
||||||
showStatusFailure="true"
|
|
||||||
showStatusIgnored="true"
|
|
||||||
showSuiteSummary="true"
|
|
||||||
timestamps="false"/>
|
|
||||||
<report-execution-times file="${basedir}/.local-execution-hints.log"/>
|
|
||||||
</listeners>
|
|
||||||
<assertions>
|
|
||||||
<enable/>
|
|
||||||
</assertions>
|
|
||||||
<parallelism>${tests.jvms}</parallelism>
|
|
||||||
<balancers>
|
|
||||||
<execution-times>
|
|
||||||
<fileset dir="${basedir}" includes=".local-execution-hints.log"/>
|
|
||||||
</execution-times>
|
|
||||||
</balancers>
|
|
||||||
<includes>
|
|
||||||
<include>**/*Tests.class</include>
|
|
||||||
<include>**/*Test.class</include>
|
|
||||||
</includes>
|
|
||||||
<excludes>
|
|
||||||
<exclude>**/Abstract*.class</exclude>
|
|
||||||
<exclude>**/*StressTest.class</exclude>
|
|
||||||
</excludes>
|
|
||||||
<jvmArgs>
|
|
||||||
<param>-Xmx512m</param>
|
|
||||||
<param>-XX:MaxDirectMemorySize=512m</param>
|
|
||||||
<param>-Des.logger.prefix=</param>
|
|
||||||
</jvmArgs>
|
|
||||||
<shuffleOnSlave>${tests.shuffle}</shuffleOnSlave>
|
|
||||||
<sysouts>${tests.verbose}</sysouts>
|
|
||||||
<seed>${tests.seed}</seed>
|
|
||||||
<haltOnFailure>${tests.failfast}</haltOnFailure>
|
|
||||||
<systemProperties>
|
|
||||||
<!-- RandomizedTesting library system properties -->
|
|
||||||
<tests.iters>${tests.iters}</tests.iters>
|
|
||||||
<tests.maxfailures>${tests.maxfailures}</tests.maxfailures>
|
|
||||||
<tests.failfast>${tests.failfast}</tests.failfast>
|
|
||||||
<tests.class>${tests.class}</tests.class>
|
|
||||||
<tests.method>${tests.method}</tests.method>
|
|
||||||
<tests.nightly>${tests.nightly}</tests.nightly>
|
|
||||||
<tests.badapples>${tests.badapples}</tests.badapples>
|
|
||||||
<tests.weekly>${tests.weekly}</tests.weekly>
|
|
||||||
<tests.slow>${tests.slow}</tests.slow>
|
|
||||||
<tests.awaitsfix>${tests.awaitsfix}</tests.awaitsfix>
|
|
||||||
<tests.slow>${tests.slow}</tests.slow>
|
|
||||||
<tests.timeoutSuite>${tests.timeoutSuite}</tests.timeoutSuite>
|
|
||||||
<tests.showSuccess>${tests.showSuccess}</tests.showSuccess>
|
|
||||||
<tests.integration>${tests.integration}</tests.integration>
|
|
||||||
<tests.cluster_seed>${tests.cluster_seed}</tests.cluster_seed>
|
|
||||||
<tests.client.ratio>${tests.client.ratio}</tests.client.ratio>
|
|
||||||
<es.node.local>${env.ES_TEST_LOCAL}</es.node.local>
|
|
||||||
<es.node.mode>${es.node.mode}</es.node.mode>
|
|
||||||
<es.logger.level>${es.logger.level}</es.logger.level>
|
|
||||||
<java.awt.headless>true</java.awt.headless>
|
|
||||||
</systemProperties>
|
|
||||||
</configuration>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
<!-- we skip surefire to work with randomized testing above -->
|
<!-- we skip surefire to work with randomized testing above -->
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-surefire-plugin</artifactId>
|
<artifactId>maven-surefire-plugin</artifactId>
|
||||||
<version>2.15</version>
|
|
||||||
<configuration>
|
|
||||||
<skipTests>true</skipTests>
|
|
||||||
</configuration>
|
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-source-plugin</artifactId>
|
<artifactId>maven-source-plugin</artifactId>
|
||||||
<version>2.1.2</version>
|
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<id>attach-sources</id>
|
|
||||||
<goals>
|
|
||||||
<goal>jar</goal>
|
|
||||||
</goals>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
<artifactId>maven-assembly-plugin</artifactId>
|
<artifactId>maven-assembly-plugin</artifactId>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue