Gehel has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/381763 )
Change subject: [wip] switch to discovery-parent-pom ...................................................................... [wip] switch to discovery-parent-pom Change-Id: I91a0ce36b9fdc8a267618e6492116ded7939392e --- D experimental-highlighter-build-tools/pom.xml D experimental-highlighter-build-tools/src/main/resources/org/wikimedia/search/highlighter/checkstyle.xml M experimental-highlighter-core/pom.xml M experimental-highlighter-elasticsearch-plugin/pom.xml M experimental-highlighter-lucene/pom.xml M pom.xml 6 files changed, 452 insertions(+), 667 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/search/highlighter refs/changes/63/381763/1 diff --git a/experimental-highlighter-build-tools/pom.xml b/experimental-highlighter-build-tools/pom.xml deleted file mode 100644 index 9428d74..0000000 --- a/experimental-highlighter-build-tools/pom.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0"; 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";> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.wikimedia.search.highlighter</groupId> - <artifactId>experimental</artifactId> - <version>5.5.3-SNAPSHOT</version> - </parent> - - <artifactId>experimental-highlighter-build-tools</artifactId> - <name>Common tools used to build this project</name> - <packaging>jar</packaging> -</project> diff --git a/experimental-highlighter-build-tools/src/main/resources/org/wikimedia/search/highlighter/checkstyle.xml b/experimental-highlighter-build-tools/src/main/resources/org/wikimedia/search/highlighter/checkstyle.xml deleted file mode 100644 index 6e97cc5..0000000 --- a/experimental-highlighter-build-tools/src/main/resources/org/wikimedia/search/highlighter/checkstyle.xml +++ /dev/null @@ -1,15 +0,0 @@ -<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN" - "http://www.puppycrawl.com/dtds/configuration_1_3.dtd";> -<module name="Checker"> - <module name="TreeWalker"> - <module name="WhitespaceAround"> - <property name="allowEmptyConstructors" value="true"/> - <property name="allowEmptyMethods" value="true"/> - <property name="allowEmptyTypes" value="true"/> - <property name="allowEmptyLoops" value="true"/> - <property name="allowEmptyLambdas" value="true"/> - <property name="tokens" value="ASSIGN, BAND, BAND_ASSIGN, BOR, BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR, BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN, DO_WHILE, EQUAL, GE, GT, LAMBDA, LAND, LCURLY, LE, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_RETURN, LITERAL_SWITCH, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, LOR, LT, MINUS, MINUS_ASSIGN, MOD, MOD_ASSIGN, NOT_EQUAL, PLUS, PLUS_ASSIGN, QUESTION, RCURLY, SL, SLIST, SL_ASSIGN, SR, SR_ASSIGN, STAR_ASSIGN, LITERAL_ASSERT, TYPE_EXTENSION_AND"/> - </module> - - </module> -</module> \ No newline at end of file diff --git a/experimental-highlighter-core/pom.xml b/experimental-highlighter-core/pom.xml index 426412b..07803c1 100644 --- a/experimental-highlighter-core/pom.xml +++ b/experimental-highlighter-core/pom.xml @@ -1,43 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.wikimedia.search.highlighter</groupId> - <artifactId>experimental</artifactId> - <version>5.5.3-SNAPSHOT</version> - </parent> - <artifactId>experimental-highlighter-core</artifactId> - <packaging>jar</packaging> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.wikimedia.search.highlighter</groupId> + <artifactId>experimental</artifactId> + <version>5.5.3-SNAPSHOT</version> + </parent> + <artifactId>experimental-highlighter-core</artifactId> + <packaging>jar</packaging> - <name>Core algorithms and interfaces for the experimental highlighter</name> + <name>Core algorithms and interfaces for the experimental highlighter</name> - <dependencies> - <dependency> - <groupId>com.carrotsearch.randomizedtesting</groupId> - <artifactId>randomizedtesting-runner</artifactId> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - </plugin> - <plugin> - <groupId>com.carrotsearch.randomizedtesting</groupId> - <artifactId>junit4-maven-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-source-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-checkstyle-plugin</artifactId> - </plugin> - </plugins> - </build> + <dependencies> + <dependency> + <groupId>com.carrotsearch.randomizedtesting</groupId> + <artifactId>randomizedtesting-runner</artifactId> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <groupId>com.carrotsearch.randomizedtesting</groupId> + <artifactId>junit4-maven-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-enforcer-plugin</artifactId> + <executions> + <execution> + <id>enforce-rules</id> + <!-- disable enforcer as this project has package cyclic dependencies --> + <phase>none</phase> + </execution> + </executions> + </plugin> + </plugins> + </build> </project> diff --git a/experimental-highlighter-elasticsearch-plugin/pom.xml b/experimental-highlighter-elasticsearch-plugin/pom.xml index c1996e7..dac06b1 100644 --- a/experimental-highlighter-elasticsearch-plugin/pom.xml +++ b/experimental-highlighter-elasticsearch-plugin/pom.xml @@ -1,129 +1,128 @@ +<?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.wikimedia.search.highlighter</groupId> - <artifactId>experimental</artifactId> - <version>5.5.3-SNAPSHOT</version> - </parent> - <artifactId>experimental-highlighter-elasticsearch-plugin</artifactId> - <packaging>jar</packaging> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.wikimedia.search.highlighter</groupId> + <artifactId>experimental</artifactId> + <version>5.5.3-SNAPSHOT</version> + </parent> + <artifactId>experimental-highlighter-elasticsearch-plugin</artifactId> + <packaging>jar</packaging> - <name>Elasticsearch plugin for experimental highlighter</name> - <description>Experimental Highlighter plugin</description> - <properties> - <elasticsearch.plugin.name>experimental-highlighter</elasticsearch.plugin.name> - </properties> + <name>Elasticsearch plugin for experimental highlighter</name> + <description>Experimental Highlighter plugin</description> + <properties> + <elasticsearch.plugin.name>experimental-highlighter</elasticsearch.plugin.name> + </properties> - <dependencies> - <dependency> - <groupId>org.wikimedia.search.highlighter</groupId> - <artifactId>experimental-highlighter-core</artifactId> - <version>${project.parent.version}</version> - </dependency> - <dependency> - <!-- This must come before experimental-highlighter-lucene or it won't work. --> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-test-framework</artifactId> - <version>${lucene.version}</version> - <scope>test</scope> - <exclusions> - <exclusion> - <artifactId>randomizedtesting-runner</artifactId> - <groupId>com.carrotsearch.randomizedtesting</groupId> - </exclusion> - <exclusion> - <artifactId>junit4-ant</artifactId> - <groupId>com.carrotsearch.randomizedtesting</groupId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.wikimedia.search.highlighter</groupId> - <artifactId>experimental-highlighter-lucene</artifactId> - <version>${project.parent.version}</version> - </dependency> - <dependency> - <groupId>org.elasticsearch</groupId> - <artifactId>elasticsearch</artifactId> - <version>${elasticsearch.version}</version> - </dependency> - <dependency> - <groupId>org.elasticsearch.test</groupId> - <artifactId>framework</artifactId> - <version>${elasticsearch.version}</version> - <scope>test</scope> - </dependency> -<!-- FIXME: switch to gradle and reuse elastic integ testing framework --> -<!-- <dependency> --> -<!-- <groupId>org.elasticsearch.plugin</groupId> --> -<!-- <artifactId>analysis-icu</artifactId> --> -<!-- <version>${elasticsearch.version}</version> --> -<!-- <scope>test</scope> --> -<!-- </dependency> --> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-api</artifactId> - <version>2.6.2</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-core</artifactId> - <version>2.6.2</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.elasticsearch</groupId> - <artifactId>securemock</artifactId> - </dependency> - </dependencies> + <dependencies> + <dependency> + <groupId>org.elasticsearch</groupId> + <artifactId>elasticsearch</artifactId> + <version>${elasticsearch.version}</version> + </dependency> + <dependency> + <groupId>org.elasticsearch</groupId> + <artifactId>securemock</artifactId> + </dependency> + <dependency> + <groupId>org.wikimedia.search.highlighter</groupId> + <artifactId>experimental-highlighter-core</artifactId> + <version>${project.parent.version}</version> + </dependency> + <dependency> + <groupId>org.wikimedia.search.highlighter</groupId> + <artifactId>experimental-highlighter-lucene</artifactId> + <version>${project.parent.version}</version> + </dependency> + <!-- FIXME: switch to gradle and reuse elastic integ testing framework --> + <!-- <dependency> --> + <!-- <groupId>org.elasticsearch.plugin</groupId> --> + <!-- <artifactId>analysis-icu</artifactId> --> + <!-- <version>${elasticsearch.version}</version> --> + <!-- <scope>test</scope> --> + <!-- </dependency> --> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + <version>2.6.2</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <version>2.6.2</version> + <scope>test</scope> + </dependency> + <dependency> + <!-- This must come before experimental-highlighter-lucene or it won't work. --> + <groupId>org.apache.lucene</groupId> + <artifactId>lucene-test-framework</artifactId> + <version>${lucene.version}</version> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>com.carrotsearch.randomizedtesting</groupId> + <artifactId>randomizedtesting-runner</artifactId> + </exclusion> + <exclusion> + <groupId>com.carrotsearch.randomizedtesting</groupId> + <artifactId>junit4-ant</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.elasticsearch.test</groupId> + <artifactId>framework</artifactId> + <version>${elasticsearch.version}</version> + <scope>test</scope> + </dependency> + </dependencies> - <build> - <resources> - <resource> - <directory>src/main/resources</directory> - <filtering>true</filtering> - <includes> - <include>*.properties</include> - </includes> - </resource> - </resources> - <plugins> - <plugin> - <groupId>com.carrotsearch.randomizedtesting</groupId> - <artifactId>junit4-maven-plugin</artifactId> - </plugin> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <version>2.2-beta-5</version> - <configuration> - <appendAssemblyId>false</appendAssemblyId> - <outputDirectory>${project.build.directory}/releases/</outputDirectory> - <descriptors> - <descriptor>${basedir}/src/main/assemblies/plugin.xml</descriptor> - </descriptors> - </configuration> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-source-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-checkstyle-plugin</artifactId> - </plugin> - </plugins> - </build> + <build> + <resources> + <resource> + <filtering>true</filtering> + <directory>src/main/resources</directory> + <includes> + <include>*.properties</include> + </includes> + </resource> + </resources> + <plugins> + <plugin> + <groupId>com.carrotsearch.randomizedtesting</groupId> + <artifactId>junit4-maven-plugin</artifactId> + </plugin> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <appendAssemblyId>false</appendAssemblyId> + <outputDirectory>${project.build.directory}/releases/</outputDirectory> + <descriptors> + <descriptor>${basedir}/src/main/assemblies/plugin.xml</descriptor> + </descriptors> + </configuration> + <executions> + <execution> + <goals> + <goal>single</goal> + </goals> + <phase>package</phase> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-enforcer-plugin</artifactId> + <executions> + <execution> + <id>enforce-rules</id> + <!-- disable enforcer as this project has package cyclic dependencies --> + <phase>none</phase> + </execution> + </executions> + </plugin> + </plugins> + </build> </project> diff --git a/experimental-highlighter-lucene/pom.xml b/experimental-highlighter-lucene/pom.xml index dd6adaa..8e11d14 100644 --- a/experimental-highlighter-lucene/pom.xml +++ b/experimental-highlighter-lucene/pom.xml @@ -1,82 +1,67 @@ +<?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.wikimedia.search.highlighter</groupId> - <artifactId>experimental</artifactId> - <version>5.5.3-SNAPSHOT</version> - </parent> - <artifactId>experimental-highlighter-lucene</artifactId> - <packaging>jar</packaging> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.wikimedia.search.highlighter</groupId> + <artifactId>experimental</artifactId> + <version>5.5.3-SNAPSHOT</version> + </parent> + <artifactId>experimental-highlighter-lucene</artifactId> + <packaging>jar</packaging> - <name>Lucene backed implementations of interfaces for experimental highlighter</name> + <name>Lucene backed implementations of interfaces for experimental highlighter</name> - <dependencies> - <dependency> - <groupId>org.wikimedia.search.highlighter</groupId> - <artifactId>experimental-highlighter-core</artifactId> - <version>${project.parent.version}</version> - </dependency> - <dependency> - <!-- Must come before lucene-core --> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-test-framework</artifactId> - <version>${lucene.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>com.carrotsearch.randomizedtesting</groupId> - <artifactId>randomizedtesting-runner</artifactId> - </dependency> - <dependency> - <groupId>org.elasticsearch</groupId> - <artifactId>securemock</artifactId> - </dependency> - <dependency> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-core</artifactId> - <version>${lucene.version}</version> - </dependency> - <dependency> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-queries</artifactId> - <version>${lucene.version}</version> - </dependency> - <dependency> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-memory</artifactId> - <version>${lucene.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-analyzers-common</artifactId> - <version>${lucene.version}</version> - <scope>test</scope> - </dependency> - </dependencies> + <dependencies> + <dependency> + <groupId>com.carrotsearch.randomizedtesting</groupId> + <artifactId>randomizedtesting-runner</artifactId> + </dependency> + <dependency> + <groupId>org.apache.lucene</groupId> + <artifactId>lucene-core</artifactId> + <version>${lucene.version}</version> + </dependency> + <dependency> + <groupId>org.apache.lucene</groupId> + <artifactId>lucene-queries</artifactId> + <version>${lucene.version}</version> + </dependency> + <dependency> + <groupId>org.elasticsearch</groupId> + <artifactId>securemock</artifactId> + </dependency> + <dependency> + <groupId>org.wikimedia.search.highlighter</groupId> + <artifactId>experimental-highlighter-core</artifactId> + <version>${project.parent.version}</version> + </dependency> + <dependency> + <groupId>org.apache.lucene</groupId> + <artifactId>lucene-analyzers-common</artifactId> + <version>${lucene.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.lucene</groupId> + <artifactId>lucene-memory</artifactId> + <version>${lucene.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <!-- Must come before lucene-core --> + <groupId>org.apache.lucene</groupId> + <artifactId>lucene-test-framework</artifactId> + <version>${lucene.version}</version> + <scope>test</scope> + </dependency> + </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - </plugin> - <plugin> - <groupId>com.carrotsearch.randomizedtesting</groupId> - <artifactId>junit4-maven-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-source-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-checkstyle-plugin</artifactId> - </plugin> - </plugins> - </build> + <build> + <plugins> + <plugin> + <groupId>com.carrotsearch.randomizedtesting</groupId> + <artifactId>junit4-maven-plugin</artifactId> + </plugin> + </plugins> + </build> </project> diff --git a/pom.xml b/pom.xml index b5b916b..d72bf00 100644 --- a/pom.xml +++ b/pom.xml @@ -1,205 +1,173 @@ <?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0"; 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";> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.sonatype.oss</groupId> - <artifactId>oss-parent</artifactId> - <version>7</version> - </parent> + <parent> + <groupId>org.wikimedia.discovery</groupId> + <artifactId>discovery-parent-pom</artifactId> + <version>1.0-SNAPSHOT</version> + </parent> - <groupId>org.wikimedia.search.highlighter</groupId> - <artifactId>experimental</artifactId> - <version>5.5.3-SNAPSHOT</version> - <packaging>pom</packaging> + <groupId>org.wikimedia.search.highlighter</groupId> + <artifactId>experimental</artifactId> + <version>5.5.3-SNAPSHOT</version> + <packaging>pom</packaging> - <modules> - <module>experimental-highlighter-build-tools</module> - <module>experimental-highlighter-core</module> - <module>experimental-highlighter-lucene</module> - <module>experimental-highlighter-elasticsearch-plugin</module> - </modules> + <licenses> + <license> + <name>The Apache Software License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <distribution>repo</distribution> + </license> + </licenses> - <licenses> - <license> - <name>The Apache Software License, Version 2.0</name> - <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> - <distribution>repo</distribution> - </license> - </licenses> + <developers> + <developer> + <id>manybubbles</id> + <name>Nik Everett</name> + <email>nik9000+highligh...@gmail.com</email> + <timezone>America/New York</timezone> + </developer> + </developers> - <developers> - <developer> - <id>manybubbles</id> - <name>Nik Everett</name> - <email>nik9000+highligh...@gmail.com</email> - <timezone>America/New York</timezone> - </developer> - </developers> + <modules> + <module>experimental-highlighter-core</module> + <module>experimental-highlighter-lucene</module> + <module>experimental-highlighter-elasticsearch-plugin</module> + </modules> - <scm> - <url>https://gerrit.wikimedia.org/r/#/admin/projects/search/highlighter</url> - <connection>scm:git:https://gerrit.wikimedia.org/r/search/highlighter</connection> - <developerConnection>scm:git:https://gerrit.wikimedia.org/r/search/highlighter</developerConnection> - <tag>HEAD</tag> - </scm> + <scm> + <connection>scm:git:https://gerrit.wikimedia.org/r/search/highlighter</connection> + <developerConnection>scm:git:https://gerrit.wikimedia.org/r/search/highlighter</developerConnection> + <tag>HEAD</tag> + <url>https://gerrit.wikimedia.org/r/#/admin/projects/search/highlighter</url> + </scm> - <issueManagement> - <system>GitHub</system> - <url>https://github.com/wikimedia/search-highlighter/issues</url> - </issueManagement> + <issueManagement> + <system>GitHub</system> + <url>https://github.com/wikimedia/search-highlighter/issues</url> + </issueManagement> - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <elasticsearch.version>5.5.2</elasticsearch.version> - <!-- For the Elasticsearch plugin to work this should match the version of Lucene that Elasticsearch + <properties> + <elasticsearch.version>5.5.2</elasticsearch.version> + <!-- For the Elasticsearch plugin to work this should match the version of Lucene that Elasticsearch uses. --> - <lucene.version>6.6.0</lucene.version> - <randomizedtesting.version>2.5.0</randomizedtesting.version> - <maven.compiler.target>1.8</maven.compiler.target> - <maven.compiler.source>1.8</maven.compiler.source> - </properties> + <lucene.version>6.6.0</lucene.version> + <randomizedtesting.version>2.5.0</randomizedtesting.version> + </properties> - <build> - <resources> - <resource> - <directory>src/main/java</directory> - </resource> - <resource> - <directory>src/main/resources</directory> - </resource> - </resources> - <testResources> - <testResource> - <directory>src/test/java</directory> - </testResource> - <testResource> - <directory>src/test/resources</directory> - </testResource> - </testResources> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>findbugs-maven-plugin</artifactId> - <version>3.0.4</version> - <configuration> - <effort>Max</effort> - <threshold>Default</threshold> - </configuration> - <executions> - <execution> - <id>findbugs-check</id> - <goals> - <goal>check</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-checkstyle-plugin</artifactId> - <version>2.17</version> - <configuration> - <configLocation>org/wikimedia/search/highlighter/checkstyle.xml</configLocation> - </configuration> - <dependencies> + <dependencyManagement> + <dependencies> <dependency> - <groupId>org.wikimedia.search.highlighter</groupId> - <artifactId>experimental-highlighter-build-tools</artifactId> - <version>${project.version}</version> + <groupId>com.carrotsearch.randomizedtesting</groupId> + <artifactId>randomizedtesting-runner</artifactId> + <version>${randomizedtesting.version}</version> + <scope>test</scope> </dependency> <dependency> - <groupId>com.puppycrawl.tools</groupId> - <artifactId>checkstyle</artifactId> - <version>7.3</version> + <groupId>org.elasticsearch</groupId> + <artifactId>securemock</artifactId> + <!-- NOTE: make sure that this version is the same granted by elasticsearch + test framework. e.g. : https://github.com/elastic/elasticsearch/blob/v2.2.1/core/src/main/resources/org/elasticsearch/bootstrap/test-framework.policy --> + <version>1.2</version> + <scope>test</scope> </dependency> - </dependencies> - <executions> - <execution> - <id>checkstyle-check</id> - <goals> - <goal>check</goal> - </goals> - <phase>verify</phase> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>3.3</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-clean-plugin</artifactId> - <version>3.0.0</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-resources-plugin</artifactId> - <version>2.7</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-install-plugin</artifactId> - <version>2.5.1</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <version>2.5</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-release-plugin</artifactId> - <version>2.5.3</version> - <configuration> - <pushChanges>false</pushChanges> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>2.19</version> - <configuration> - <skipTests>true</skipTests> - </configuration> - </plugin> - <plugin> - <groupId>com.carrotsearch.randomizedtesting</groupId> - <artifactId>junit4-maven-plugin</artifactId> - <version>${randomizedtesting.version}</version> - <executions> - <execution> - <id>tests</id> - <phase>test</phase> - <goals> - <goal>junit4</goal> - </goals> - <configuration> - <excludes><exclude>**/ElasticsearchQueryFlattenerTest.class</exclude></excludes> - <skipTests>${skip.unit.tests}</skipTests> - <listeners> - <report-text showThrowable="true" showStackTraces="true" showOutput="onerror" showStatusOk="false" showStatusError="true" showStatusFailure="true" showStatusIgnored="true" showSuiteSummary="true" showNumFailures="30" timestamps="false"> - </report-text> - <report-ant-xml mavenExtensions="true" dir="${project.build.directory}/surefire-reports" /> - </listeners> - <heartbeat>20</heartbeat> - <jvmOutputAction>warn</jvmOutputAction> - <leaveTemporary>true</leaveTemporary> - <sysouts>false</sysouts> - <assertions> - <enable /> - </assertions> - <jvmArgs> - <param>-Xmx512m</param> - <param>-XX:MaxDirectMemorySize=512m</param> - <param>-Des.logger.prefix=</param> - </jvmArgs> - </configuration> - </execution> - <!-- + </dependencies> + </dependencyManagement> + + <dependencies> + <dependency> + <groupId>com.github.spotbugs</groupId> + <artifactId>spotbugs-annotations</artifactId> + <version>${spotbugs.version}</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>com.google.code.findbugs</groupId> + <artifactId>jsr305</artifactId> + <version>3.0.2</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>18.0</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.12</version> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-core</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-all</artifactId> + <version>1.3</version> + <scope>test</scope> + </dependency> + </dependencies> + + <build> + <resources> + <resource> + <directory>src/main/java</directory> + </resource> + <resource> + <directory>src/main/resources</directory> + </resource> + </resources> + <testResources> + <testResource> + <directory>src/test/java</directory> + </testResource> + <testResource> + <directory>src/test/resources</directory> + </testResource> + </testResources> + <pluginManagement> + <plugins> + <plugin> + <groupId>com.carrotsearch.randomizedtesting</groupId> + <artifactId>junit4-maven-plugin</artifactId> + <version>${randomizedtesting.version}</version> + <executions> + <execution> + <id>tests</id> + <goals> + <goal>junit4</goal> + </goals> + <phase>test</phase> + <configuration> + <excludes> + <exclude>**/ElasticsearchQueryFlattenerTest.class</exclude> + </excludes> + <skipTests>${skip.unit.tests}</skipTests> + <listeners> + <report-text showNumFailures="30" showOutput="onerror" showStackTraces="true" showStatusError="true" showStatusFailure="true" showStatusIgnored="true" showStatusOk="false" showSuiteSummary="true" showThrowable="true" timestamps="false"></report-text> + <report-ant-xml dir="${project.build.directory}/surefire-reports" mavenExtensions="true"></report-ant-xml> + </listeners> + <heartbeat>20</heartbeat> + <jvmOutputAction>warn</jvmOutputAction> + <leaveTemporary>true</leaveTemporary> + <sysouts>false</sysouts> + <assertions> + <enable></enable> + </assertions> + <jvmArgs> + <param>-Xmx512m</param> + <param>-XX:MaxDirectMemorySize=512m</param> + <param>-Des.logger.prefix=</param> + </jvmArgs> + </configuration> + </execution> + <!-- FIXME: Separate execution for ElasticsearchQueryFlattenerTest This one does not use Elasticsearch integration testing framework but it needs to run in a separate JVM otherwize the security manager @@ -207,217 +175,83 @@ Should be fixed with clear separation of unit tests and integ test when migrating to gradle. --> - <execution> - <id>tests-junit</id> - <phase>test</phase> - <goals> - <goal>junit4</goal> - </goals> - <configuration> - <includes><include>**/ElasticsearchQueryFlattenerTest.class</include></includes> - <skipTests>${skip.unit.tests}</skipTests> - <listeners> - <report-text showThrowable="true" showStackTraces="true" showOutput="onerror" showStatusOk="false" showStatusError="true" showStatusFailure="true" showStatusIgnored="true" showSuiteSummary="true" showNumFailures="30" timestamps="false"> - </report-text> - <report-ant-xml mavenExtensions="true" dir="${project.build.directory}/surefire-reports" /> - </listeners> - <heartbeat>20</heartbeat> - <jvmOutputAction>warn</jvmOutputAction> - <leaveTemporary>true</leaveTemporary> - <sysouts>false</sysouts> - <assertions> - <enable /> - </assertions> - <jvmArgs> - <param>-Xmx512m</param> - <param>-XX:MaxDirectMemorySize=512m</param> - <param>-Des.logger.prefix=</param> - </jvmArgs> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-source-plugin</artifactId> - <version>2.4</version> - <executions> - <execution> - <id>attach-sources</id> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.10.4</version> - <executions> - <execution> - <id>attach-javadocs</id> - <goals> - <goal>jar</goal> - </goals> - <configuration> - <quiet>true</quiet> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.eclipse.m2e</groupId> - <artifactId>lifecycle-mapping</artifactId> - <version>1.0.0</version> - <configuration> - <lifecycleMappingMetadata> - <pluginExecutions> - <pluginExecution> - <pluginExecutionFilter> + <execution> + <id>tests-junit</id> + <goals> + <goal>junit4</goal> + </goals> + <phase>test</phase> + <configuration> + <includes> + <include>**/ElasticsearchQueryFlattenerTest.class</include> + </includes> + <skipTests>${skip.unit.tests}</skipTests> + <listeners> + <report-text showNumFailures="30" showOutput="onerror" showStackTraces="true" showStatusError="true" showStatusFailure="true" showStatusIgnored="true" showStatusOk="false" showSuiteSummary="true" showThrowable="true" timestamps="false"></report-text> + <report-ant-xml dir="${project.build.directory}/surefire-reports" mavenExtensions="true"></report-ant-xml> + </listeners> + <heartbeat>20</heartbeat> + <jvmOutputAction>warn</jvmOutputAction> + <leaveTemporary>true</leaveTemporary> + <sysouts>false</sysouts> + <assertions> + <enable></enable> + </assertions> + <jvmArgs> + <param>-Xmx512m</param> + <param>-XX:MaxDirectMemorySize=512m</param> + <param>-Des.logger.prefix=</param> + </jvmArgs> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-enforcer-plugin</artifactId> - <versionRange>[1.0.0,)</versionRange> - <goals> - <goal>enforce</goal> - </goals> - </pluginExecutionFilter> - <action> - <ignore /> - </action> - </pluginExecution> - <pluginExecution> - <pluginExecutionFilter> - <groupId>de.thetaphi</groupId> - <artifactId>forbiddenapis</artifactId> - <versionRange>[1.5,)</versionRange> - <goals> - <goal>testCheck</goal> - <goal>check</goal> - </goals> - </pluginExecutionFilter> - <action> - <ignore /> - </action> - </pluginExecution> - </pluginExecutions> - </lifecycleMappingMetadata> - </configuration> - </plugin> - </plugins> - </pluginManagement> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>findbugs-maven-plugin</artifactId> - </plugin> - <plugin> - <groupId>de.thetaphi</groupId> - <artifactId>forbiddenapis</artifactId> - <version>1.6.1</version> - <configuration> - <targetVersion>${maven.compiler.target}</targetVersion> - <failOnMissingClasses>false</failOnMissingClasses> <!-- this is a bug in forbidden APIs since 1.5 looks also at annotations --> - <!-- disallow undocumented classes like sun.misc.Unsafe: --> - <internalRuntimeForbidden>true</internalRuntimeForbidden> - <!-- if the used Java version is too new, don't fail, just do nothing: --> - <failOnUnsupportedJava>false</failOnUnsupportedJava> - <bundledSignatures> - <!-- This will automatically choose the right signatures based on 'maven.compiler.target': --> - <bundledSignature>jdk-unsafe</bundledSignature> - <bundledSignature>jdk-deprecated</bundledSignature> - <bundledSignaure>jdk-system-out</bundledSignaure> - </bundledSignatures> - </configuration> - <executions> - <execution> - <id>check-forbidden-apis</id> - <phase>compile</phase> - <goals> - <goal>check</goal> - </goals> - <configuration> - <signaturesFiles> - <signaturesFile>forbidden-signatures.txt</signaturesFile> - </signaturesFiles> - </configuration> - </execution> - <execution> - <id>check-forbidden-test-apis</id> - <phase>test-compile</phase> - <goals> - <goal>testCheck</goal> - </goals> - <configuration> - <signaturesFiles> - <signaturesFile>../forbidden-test-signatures.txt</signaturesFile> - </signaturesFiles> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - - <dependencyManagement> - <dependencies> - <dependency> - <groupId>com.carrotsearch.randomizedtesting</groupId> - <artifactId>randomizedtesting-runner</artifactId> - <version>${randomizedtesting.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.elasticsearch</groupId> - <artifactId>securemock</artifactId> - <!-- NOTE: make sure that this version is the same granted by elasticsearch - test framework. e.g. : https://github.com/elastic/elasticsearch/blob/v2.2.1/core/src/main/resources/org/elasticsearch/bootstrap/test-framework.policy --> - <version>1.2</version> - <scope>test</scope> - </dependency> - </dependencies> - </dependencyManagement> - - <dependencies> - <dependency> - <groupId>com.google.code.findbugs</groupId> - <artifactId>annotations</artifactId> - <version>3.0.1u2</version> - <scope>provided</scope> - <exclusions> - <exclusion> - <groupId>net.jcip</groupId> - <artifactId>jcip-annotations</artifactId> - </exclusion> - <exclusion> - <groupId>com.google.code.findbugs</groupId> - <artifactId>jsr305</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-all</artifactId> - <version>1.3</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.12</version> - <scope>test</scope> - <exclusions> - <exclusion> - <artifactId>hamcrest-core</artifactId> - <groupId>org.hamcrest</groupId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - <version>18.0</version> - <scope>test</scope> - </dependency> - </dependencies> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <skipTests>true</skipTests> + </configuration> + </plugin> + <plugin> + <groupId>org.eclipse.m2e</groupId> + <artifactId>lifecycle-mapping</artifactId> + <version>1.0.0</version> + <configuration> + <lifecycleMappingMetadata> + <pluginExecutions> + <pluginExecution> + <pluginExecutionFilter> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-enforcer-plugin</artifactId> + <versionRange>[1.0.0,)</versionRange> + <goals> + <goal>enforce</goal> + </goals> + </pluginExecutionFilter> + <action> + <ignore></ignore> + </action> + </pluginExecution> + <pluginExecution> + <pluginExecutionFilter> + <groupId>de.thetaphi</groupId> + <artifactId>forbiddenapis</artifactId> + <versionRange>[1.5,)</versionRange> + <goals> + <goal>testCheck</goal> + <goal>check</goal> + </goals> + </pluginExecutionFilter> + <action> + <ignore></ignore> + </action> + </pluginExecution> + </pluginExecutions> + </lifecycleMappingMetadata> + </configuration> + </plugin> + </plugins> + </pluginManagement> + </build> </project> -- To view, visit https://gerrit.wikimedia.org/r/381763 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I91a0ce36b9fdc8a267618e6492116ded7939392e Gerrit-PatchSet: 1 Gerrit-Project: search/highlighter Gerrit-Branch: master Gerrit-Owner: Gehel <guillaume.leder...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
