jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/383791 )
Change subject: start using discovery-parent-pom
......................................................................
start using discovery-parent-pom
Change-Id: Ia6e475d3a86d070347fe5abe157e0881aaae2784
---
M blazegraph/pom.xml
M common/pom.xml
M pom.xml
D src/build/checkstyle/checkstyle.xml
D src/build/checkstyle/suppressions.xml
D src/build/forbidden/all.txt
D src/build/forbidden/core.txt
D src/build/forbidden/test.txt
M testTools/pom.xml
M tools/pom.xml
10 files changed, 63 insertions(+), 752 deletions(-)
Approvals:
Smalyshev: Looks good to me, approved
jenkins-bot: Verified
diff --git a/blazegraph/pom.xml b/blazegraph/pom.xml
index 140bb65..091bfe5 100644
--- a/blazegraph/pom.xml
+++ b/blazegraph/pom.xml
@@ -53,6 +53,10 @@
<artifactId>jackson-databind</artifactId>
</dependency>
<dependency>
+ <groupId>com.github.spotbugs</groupId>
+ <artifactId>spotbugs-annotations</artifactId>
+ </dependency>
+ <dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
</dependency>
@@ -162,24 +166,15 @@
</testResources>
<plugins>
<plugin>
- <groupId>com.carrotsearch.randomizedtesting</groupId>
- <artifactId>junit4-maven-plugin</artifactId>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-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-source-plugin</artifactId>
+ <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>
diff --git a/common/pom.xml b/common/pom.xml
index a7fea33..da03212 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -20,8 +20,8 @@
<dependencies>
<dependency>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>findbugs-annotations</artifactId>
+ <groupId>com.github.spotbugs</groupId>
+ <artifactId>spotbugs-annotations</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -38,27 +38,5 @@
<build>
<finalName>wikidata-query-common-${project.version}</finalName>
- <plugins>
- <plugin>
- <groupId>com.carrotsearch.randomizedtesting</groupId>
- <artifactId>junit4-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-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-source-plugin</artifactId>
- </plugin>
- </plugins>
</build>
</project>
diff --git a/pom.xml b/pom.xml
index b2a9d4e..edcd8be 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,9 +2,9 @@
<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.sonatype.oss</groupId>
- <artifactId>oss-parent</artifactId>
- <version>7</version>
+ <groupId>org.wikimedia.discovery</groupId>
+ <artifactId>discovery-parent-pom</artifactId>
+ <version>1.6</version>
</parent>
<groupId>org.wikidata.query.rdf</groupId>
<artifactId>parent</artifactId>
@@ -34,10 +34,6 @@
</developer>
</developers>
- <prerequisites>
- <maven>3.3.1</maven>
- </prerequisites>
-
<modules>
<module>testTools</module>
<module>common</module>
@@ -49,7 +45,7 @@
<scm>
<connection>scm:git:https://gerrit.wikimedia.org/r/wikidata/query/rdf</connection>
-
<developerConnection>scm:git:https://gerrit.wikimedia.org/r/wikidata/query/rdf</developerConnection>
+
<developerConnection>scm:git:ssh://gerrit.wikimedia.org:29418/wikidata/query/rdf</developerConnection>
<url>https://gerrit.wikimedia.org/r/#/admin/projects/wikidata/query/rdf</url>
</scm>
@@ -58,23 +54,11 @@
<url><![CDATA[https://phabricator.wikimedia.org/maniphest/?statuses=open%2Cstalled&allProjects=PHID-PROJ-ceqceb2bnio6alj5nxov#R]]></url>
</issueManagement>
- <distributionManagement>
- <repository>
- <id>ossrh</id>
-
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
- </repository>
- <snapshotRepository>
- <id>ossrh</id>
- <url>https://oss.sonatype.org/content/repositories/snapshots</url>
- </snapshotRepository>
- </distributionManagement>
-
<properties>
<blazegraph.version>2.1.5-SNAPSHOT</blazegraph.version>
<jackson.version>2.2.3</jackson.version>
<jetty.version>9.2.3.v20140905</jetty.version>
<logback.version>1.2.3</logback.version>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<sesame.version>2.7.12</sesame.version>
<slf4j.version>1.7.10</slf4j.version>
</properties>
@@ -229,16 +213,6 @@
<groupId>com.github.rholder</groupId>
<artifactId>guava-retrying</artifactId>
<version>2.0.0</version>
- </dependency>
- <dependency>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>findbugs-annotations</artifactId>
- <version>3.0.1</version>
- </dependency>
- <dependency>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- <version>3.0.2</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
@@ -598,12 +572,6 @@
<version>1.3</version>
<scope>test</scope>
</dependency>
- <!-- dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <version>1.9.5</version>
- <scope>test</scope>
- </dependency -->
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
@@ -767,175 +735,50 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>3.0.0</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.17</version>
- <dependencies>
- <dependency>
- <groupId>com.puppycrawl.tools</groupId>
- <artifactId>checkstyle</artifactId>
- <version>7.6.1</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <id>validate</id>
- <goals>
- <goal>check</goal>
- </goals>
- <phase>test</phase>
- <configuration>
-
<configLocation>${project.parent.basedir}/src/build/checkstyle/checkstyle.xml</configLocation>
-
<propertyExpansion>checkstyle.suppressions=${project.parent.basedir}/src/build/checkstyle/suppressions.xml</propertyExpansion>
-
<includeTestSourceDirectory>true</includeTestSourceDirectory>
- <encoding>UTF-8</encoding>
- <consoleOutput>true</consoleOutput>
- <failsOnError>true</failsOnError>
- </configuration>
- </execution>
- </executions>
- </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-compiler-plugin</artifactId>
- <version>3.6.1</version>
- <configuration>
- <source>1.8</source>
- <target>1.8</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>3.0.0</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <version>2.8.2</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <version>1.4.1</version>
- <configuration>
- <rules>
- <requireMavenVersion>
- <version>3.3.1</version>
- </requireMavenVersion>
- </rules>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-install-plugin</artifactId>
- <version>2.5.2</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>3.0.2</version>
- </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>
- <!-- We don't want Java 8's strict javadoc
checking so we use this trick borrowed from dropwizard to turn
- it off -->
-
<additionalparam>${javadoc.doclint.none}</additionalparam>
-
<excludePackageNames>com.bigdata.rdf.internal</excludePackageNames>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <version>2.5.3</version>
<configuration>
- <pushChanges>false</pushChanges>
- <autoVersionSubmodules>true</autoVersionSubmodules>
- <useReleaseProfile>false</useReleaseProfile>
- <releaseProfiles>release</releaseProfiles>
- <goals>deploy</goals>
+
<excludePackageNames>com.bigdata.rdf.internal</excludePackageNames>
</configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <version>3.0.2</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <version>3.6</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <version>3.0.1</version>
- <executions>
- <execution>
- <id>attach-sources</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.20</version>
<configuration>
<skipTests>true</skipTests>
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <version>3.0.0</version>
+ <groupId>org.basepom.maven</groupId>
+ <artifactId>duplicate-finder-maven-plugin</artifactId>
+ <configuration>
+ <ignoredDependencies>
+ <!--
+ the following dependencies are problematic but non trivial to
+ clean, it will come in a second time...
+ -->
+ <dependency>
+ <groupId>colt</groupId>
+ <artifactId>colt</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </dependency>
+ </ignoredDependencies>
+ </configuration>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>1.6.0</version>
- </plugin>
- <!-- plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>3.0.4</version>
- <configuration>
- <effort>high</effort>
- <threshold>low</threshold>
- </configuration>
- <executions>
- <execution>
- <id>findbugs-check</id>
- <goals>
- <goal>check</goal>
- </goals>
- <phase>verify</phase>
- </execution>
- </executions>
- </plugin -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>properties-maven-plugin</artifactId>
@@ -974,167 +817,12 @@
</systemProperties>
</configuration>
</plugin>
- <plugin>
- <groupId>org.sonatype.plugins</groupId>
- <artifactId>nexus-staging-maven-plugin</artifactId>
- <version>1.6.8</version>
- <extensions>true</extensions>
- <configuration>
- <serverId>ossrh</serverId>
- <nexusUrl>https://oss.sonatype.org/</nexusUrl>
- <autoReleaseAfterClose>true</autoReleaseAfterClose>
- </configuration>
- </plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
- <groupId>com.github.ekryd.sortpom</groupId>
- <artifactId>sortpom-maven-plugin</artifactId>
- <!-- version 2.5.0 is compiled with Java 8 as target class
format -->
- <version>2.4.0</version>
- <configuration>
-
<predefinedSortOrder>recommended_2008_06</predefinedSortOrder>
-
<sortDependencies>scope,groupId,artifactId</sortDependencies>
- <sortPlugins>groupId,artifactId</sortPlugins>
- <lineSeparator>\n</lineSeparator>
- <encoding>${project.build.sourceEncoding}</encoding>
- <sortProperties>true</sortProperties>
- <keepBlankLines>true</keepBlankLines>
- <nrOfIndentSpace>2</nrOfIndentSpace>
- <verifyFail>Stop</verifyFail>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>verify</goal>
- </goals>
- <phase>verify</phase>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>com.github.ekryd.sortpom</groupId>
- <artifactId>sortpom-maven-plugin</artifactId>
- <version>2.8.0</version>
- <configuration>
-
<predefinedSortOrder>recommended_2008_06</predefinedSortOrder>
-
<sortDependencies>scope,groupId,artifactId</sortDependencies>
- <sortPlugins>groupId,artifactId</sortPlugins>
- <lineSeparator>\n</lineSeparator>
- <encoding>${project.build.sourceEncoding}</encoding>
- <sortProperties>true</sortProperties>
- <keepBlankLines>true</keepBlankLines>
- <nrOfIndentSpace>4</nrOfIndentSpace>
- <verifyFail>Stop</verifyFail>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>verify</goal>
- </goals>
- <phase>verify</phase>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>de.thetaphi</groupId>
- <artifactId>forbiddenapis</artifactId>
- <version>2.3</version>
- <configuration>
- <targetVersion>1.8</targetVersion>
- <failOnMissingClasses>false</failOnMissingClasses>
- <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>
- <bundledSignaure>jdk-non-portable</bundledSignaure>
- </bundledSignatures>
- </configuration>
- <executions>
- <execution>
- <id>check-forbidden-apis</id>
- <goals>
- <goal>check</goal>
- </goals>
- <phase>compile</phase>
- <configuration>
- <signaturesFiles>
-
<signaturesFile>${project.parent.basedir}/src/build/forbidden/all.txt</signaturesFile>
-
<signaturesFile>${project.parent.basedir}/src/build/forbidden/core.txt</signaturesFile>
- </signaturesFiles>
- <excludes>
- <!-- Some portions of the project need access
to System.out and things so we contain them in inner classes
- of this form. -->
- <exclude>**/*$ForbiddenOk**.class</exclude>
- </excludes>
- </configuration>
- </execution>
- <execution>
- <id>check-forbidden-test-apis</id>
- <goals>
- <goal>testCheck</goal>
- </goals>
- <phase>test-compile</phase>
- <configuration>
- <signaturesFiles>
-
<signaturesFile>${project.parent.basedir}/src/build/forbidden/all.txt</signaturesFile>
-
<signaturesFile>${project.parent.basedir}/src/build/forbidden/test.txt</signaturesFile>
- </signaturesFiles>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.basepom.maven</groupId>
- <artifactId>duplicate-finder-maven-plugin</artifactId>
- <version>1.2.1</version>
- <configuration>
-
<failBuildInCaseOfDifferentContentConflict>true</failBuildInCaseOfDifferentContentConflict>
-
<failBuildInCaseOfEqualContentConflict>false</failBuildInCaseOfEqualContentConflict>
-
<failBuildInCaseOfConflict>false</failBuildInCaseOfConflict>
- <ignoredDependencies>
- <!--
- the following dependencies are problematic but non trivial to
- clean, it will come in a second time...
- -->
- <dependency>
- <groupId>colt</groupId>
- <artifactId>colt</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils-core</artifactId>
- </dependency>
- <dependency>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- </dependency>
- <dependency>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- </dependency>
- </ignoredDependencies>
- </configuration>
- <executions>
- <execution>
- <id>duplicate-classes-check</id>
- <goals>
- <goal>check</goal>
- </goals>
- <phase>verify</phase>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>3.0.4</version>
+ <groupId>com.carrotsearch.randomizedtesting</groupId>
+ <artifactId>junit4-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
@@ -1191,94 +879,6 @@
</plugin>
</plugins>
</pluginManagement>
- </build>
- </profile>
- <profile>
- <id>java-8</id>
- <activation>
- <jdk>[1.8,)</jdk>
- </activation>
- <properties>
- <javadoc.doclint.none>-Xdoclint:none</javadoc.doclint.none>
- </properties>
- </profile>
- <profile>
- <id>noVerify</id>
- <build>
- <plugins>
- <plugin>
- <groupId>de.thetaphi</groupId>
- <artifactId>forbiddenapis</artifactId>
- <executions>
- <execution>
- <id>check-forbidden-apis</id>
- <phase>none</phase>
- </execution>
- <execution>
- <id>check-forbidden-test-apis</id>
- <phase>none</phase>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <executions>
- <execution>
- <id>validate</id>
- <phase>none</phase>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>release</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-gpg-plugin</artifactId>
- <version>1.6</version>
- <executions>
- <execution>
- <id>sign-artifacts</id>
- <goals>
- <goal>sign</goal>
- </goals>
- <phase>verify</phase>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>deploy-archiva</id>
- <distributionManagement>
- <repository>
- <id>wikimedia.releases</id>
- <name>Wikimedia Release Repository</name>
-
<url>https://archiva.wikimedia.org/repository/releases/</url>
- </repository>
- <snapshotRepository>
- <id>wikimedia.snapshots</id>
- <name>Wikimedia Snapshot Repository</name>
-
<url>https://archiva.wikimedia.org/repository/snapshots/</url>
- </snapshotRepository>
- </distributionManagement>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.18.1</version>
- <configuration>
- <skipTests>true</skipTests>
- </configuration>
- </plugin>
- </plugins>
</build>
</profile>
</profiles>
diff --git a/src/build/checkstyle/checkstyle.xml
b/src/build/checkstyle/checkstyle.xml
deleted file mode 100644
index 7c4840c..0000000
--- a/src/build/checkstyle/checkstyle.xml
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version="1.0"?>
-<!-- Copyright (C) 2014 Wikimedia Foundation Licensed 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. -->
-<!DOCTYPE module PUBLIC
- "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
- "http://www.puppycrawl.com/dtds/configuration_1_2.dtd";>
-
-<module name="Checker">
- <module name="SuppressWarningsFilter" />
- <module name="SuppressionFilter">
- <!-- Suppresses some checks for tests. -->
- <property name="file" value="${checkstyle.suppressions}" />
- </module>
- <module name="TreeWalker">
- <module name="SuppressWarningsHolder" />
- <!-- Javadoc -->
- <module name="JavadocType">
- <property name="allowMissingParamTags" value="true" /> <!-- Sometimes
its just overkill -->
- </module>
- <module name="JavadocMethod">
- <property name="allowUndeclaredRTE" value="true" /> <!-- You aren't
supposed to declare these anyway... -->
- <property name="allowMissingReturnTag" value="true" /> <!-- Sometimes
its just overkill -->
- <property name="allowMissingParamTags" value="true" /> <!-- Sometimes
its just overkill -->
- <property name="tokens" value="METHOD_DEF" /> <!-- Constructors don't
always need Javadoc -->
- </module>
- <module name="JavadocStyle" />
- <module name="JavadocVariable">
- <property name="ignoreNamePattern" value="log|serialVersionUID" /> <!--
These are obvious. -->
- </module>
-
-
- <!-- Formatting -->
- <module name="Indentation">
- <property name="basicOffset" value="4" />
- <property name="caseIndent" value="0" />
- </module>
- <module name="LineLength">
- <property name="max" value="160" />
- </module>
- <module name="MethodParamPad" />
- <module name="NoWhitespaceAfter" />
- <module name="NoWhitespaceBefore" />
- <module name="ParenPad" />
- <module name="TypecastParenPad">
- <property name="option" value="nospace" />
- </module>
- <module name="WhitespaceAfter">
- <property name="tokens" value="COMMA, SEMI" /> <!-- not typecasts -->
- </module>
- <module name="WhitespaceAround">
- <property name="allowEmptyConstructors" value="true" />
- <property name="allowEmptyMethods" value="true" />
- <property name="allowEmptyTypes" value="true" />
- <property name="allowEmptyLoops" value="true" />
- </module>
- <module name="ModifierOrder" />
- <module name="RedundantModifier" />
- <module name="EmptyBlock">
- <!-- Put a comment in it if you need one explaining why -->
- <property name="option" value="text" />
- </module>
- <module name="LeftCurly">
- <property name="maxLineLength" value="120" />
- </module>
- <module name="RightCurly" />
- <module name="AvoidNestedBlocks">
- <property name="allowInSwitchCase" value="true" />
- </module>
- <module name="EmptyStatement" />
- <module name="UpperEll" /> <!-- Lowercase l is hard to read -->
- <module name="ArrayTypeStyle" />
-
-
- <!-- Naming conventions -->
- <module name="PackageName">
- <property name="format" value="^[a-z]+(\.[a-z][a-z0-9]*)*$" />
- </module>
- <module name="TypeName" />
- <module name="ConstantName">
- <!-- Allow "log". There might be other non-constant static finals but
they should be rare enough we can just list them
- here when they come up. -->
- <property name="format" value="^([A-Z][A-Z0-9]*(_[A-Z0-9]+)*|log)$" />
- </module>
- <module name="MemberName" />
- <module name="LocalFinalVariableName" />
- <module name="LocalVariableName" />
- <module name="ParameterName" />
- <module name="StaticVariableName" />
- <module name="UnnecessaryParentheses" />
- <module name="PackageDeclaration" />
-
-
- <!-- Import -->
- <module name="AvoidStarImport" />
- <module name="IllegalImport" />
- <module name="RedundantImport" />
- <module name="UnusedImports" />
- <module name="ImportOrder">
- <property name="option" value="top"/>
- <property name="groups" value="/^java\./,javax,org,com,"/>
- <property name="ordered" value="false"/>
- <property name="caseSensitive" value="false"/>
- <property name="separated" value="true"/>
- <property name="sortStaticImportsAlphabetically" value="true"/>
- </module>
-
-
- <!-- Common coding problems/opinionates stuff -->
- <module name="CovariantEquals" />
- <module name="EqualsHashCode" />
- <module name="InnerAssignment" /> <!-- Too suprising -->
- <module name="MissingSwitchDefault" /> <!-- Just comment that its a noop
if its a noop -->
- <module name="ModifiedControlVariable" />
- <module name="SimplifyBooleanExpression" />
- <module name="SimplifyBooleanReturn" />
- <module name="StringLiteralEquality" />
- <module name="SuperClone" />
- <module name="SuperFinalize" />
- <module name="IllegalCatch" />
- <module name="IllegalThrows" />
- <module name="ExplicitInitialization" /> <!-- May as well let Java do what
its going to do -->
- <module name="DefaultComesLast" />
- <module name="FallThrough" />
- <module name="MultipleVariableDeclarations" />
- <module name="VisibilityModifier" /> <!-- May as well follow standard Java
style here -->
- <module name="FinalClass" />
- <module name="HideUtilityClassConstructor" />
- <!-- This one usually offers good to interesting suggestions but its too
much work to implement now. <module name="DesignForExtension"/> -->
- <module name="MutableException" />
- <module name="UncommentedMain">
- <property name="excludedClasses"
value="org\.wikidata\.query\.rdf\.tool\..*" />
- </module>
-
-
- <!-- Really opinionated. Probably wrong. -->
- <module name="ClassFanOutComplexity">
- <property name="id" value="checkstyle:classfanoutcomplexity"/>
- <property name="max" value="25"/>
- </module>
- <module name="CyclomaticComplexity" />
- <module name="NPathComplexity" />
-
- <!-- These are explicitly ok -->
- <!-- <module name="ParameterAssignment"/> Usually used when munging
parameters. Fine. -->
- <!-- <module name="TrailingComment"/> -->
- <!-- <module name="HiddenField"/> It turns out that we do this all the
time in setters and constructors. -->
- <!-- <module name="ImportOrder"> Its just not worth trying to get imports
to line up. -->
- </module>
-
- <!-- More formatting stuff that can't be in TreeWalker -->
- <module name="NewlineAtEndOfFile" />
- <module name="RegexpSingleline">
- <property name="format" value="\s+$" />
- <property name="message" value="Line has trailing spaces." />
- </module>
-</module>
diff --git a/src/build/checkstyle/suppressions.xml
b/src/build/checkstyle/suppressions.xml
deleted file mode 100644
index d2aa670..0000000
--- a/src/build/checkstyle/suppressions.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-<!-- Copyright (C) 2014 Wikimedia Foundation Licensed 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. -->
-<!DOCTYPE suppressions PUBLIC
- "-//Puppy Crawl//DTD Suppressions 1.1//EN"
- "http://www.puppycrawl.com/dtds/suppressions_1_1.dtd";>
-
-<suppressions>
- <!-- Tests don't need anywhere near that Javadoc that production code does.
-->
- <suppress checks="JavadocType" files=".*Test.java" />
- <suppress checks="JavadocMethod" files=".*Test.java" />
- <suppress checks="JavadocVariable" files=".*Test.java" />
-</suppressions>
-
\ No newline at end of file
diff --git a/src/build/forbidden/all.txt b/src/build/forbidden/all.txt
deleted file mode 100644
index c2a4111..0000000
--- a/src/build/forbidden/all.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-# Borrowed shamelessly from Elasticsearch
-
-@defaultMessage Convert to URI
-java.net.URL#getPath()
-java.net.URL#getFile()
diff --git a/src/build/forbidden/core.txt b/src/build/forbidden/core.txt
deleted file mode 100644
index 371104e..0000000
--- a/src/build/forbidden/core.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-# Borrowed shamelessly from Elasticsearch
-
-@defaultMessage spawns threads with vague names; use a custom thread factory
and name threads so that you can tell (by its name) which executor it is
associated with
-
-java.util.concurrent.Executors#newFixedThreadPool(int)
-java.util.concurrent.Executors#newSingleThreadExecutor()
-java.util.concurrent.Executors#newCachedThreadPool()
-java.util.concurrent.Executors#newSingleThreadScheduledExecutor()
-java.util.concurrent.Executors#newScheduledThreadPool(int)
-java.util.concurrent.Executors#defaultThreadFactory()
-java.util.concurrent.Executors#privilegedThreadFactory()
-
-java.lang.Character#codePointBefore(char[],int) @ Implicit start offset is
error-prone when the char[] is a buffer and the first chars are random chars
-java.lang.Character#codePointAt(char[],int) @ Implicit end offset is
error-prone when the char[] is a buffer and the last chars are random chars
-
-@defaultMessage Collections.sort dumps data into an array, sorts the array and
reinserts data into the list. Elasticsearch uses Lucene's CollectionUtil but we
should do something else
-java.util.Collections#sort(java.util.List)
-java.util.Collections#sort(java.util.List,java.util.Comparator)
-
-
-@defaultMessage Only use wait / notify when really needed try to use
concurrency primitives, latches or callbacks instead.
-java.lang.Object#wait()
-java.lang.Object#wait(long)
-java.lang.Object#wait(long,int)
-java.lang.Object#notify()
-java.lang.Object#notifyAll()
-
-@defaultMessage Beware of the behavior of this method on MIN_VALUE
-java.lang.Math#abs(int)
-java.lang.Math#abs(long)
-
-@defaultMessage Please do not try to stop the world
-java.lang.System#gc()
-
-# Disabled for a bit because it causes compilation to fail on things that
don't depend on guava
-#@defaultMessage Use Long.compare instead we are on Java7
-#com.google.common.primitives.Longs#compare(long,long)
-
-@defaultMessage Use Channels.* methods to write to channels. Do not write
directly.
-java.nio.channels.WritableByteChannel#write(java.nio.ByteBuffer)
-java.nio.channels.FileChannel#write(java.nio.ByteBuffer, long)
-java.nio.channels.GatheringByteChannel#write(java.nio.ByteBuffer[], int, int)
-java.nio.channels.GatheringByteChannel#write(java.nio.ByteBuffer[])
-java.nio.channels.ReadableByteChannel#read(java.nio.ByteBuffer)
-java.nio.channels.ScatteringByteChannel#read(java.nio.ByteBuffer[])
-java.nio.channels.ScatteringByteChannel#read(java.nio.ByteBuffer[], int, int)
-java.nio.channels.FileChannel#read(java.nio.ByteBuffer, long)
-
-@defaultMessage These throw out the stack trace so are almost always wrong
-java.lang.Throwable#getMessage()
-java.lang.Throwable#toString()
diff --git a/src/build/forbidden/test.txt b/src/build/forbidden/test.txt
deleted file mode 100644
index e69de29..0000000
--- a/src/build/forbidden/test.txt
+++ /dev/null
diff --git a/testTools/pom.xml b/testTools/pom.xml
index c965696..58f6564 100644
--- a/testTools/pom.xml
+++ b/testTools/pom.xml
@@ -58,28 +58,4 @@
</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-checkstyle-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-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-source-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
</project>
diff --git a/tools/pom.xml b/tools/pom.xml
index 79c4227..222d3c2 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -38,6 +38,10 @@
<artifactId>guava-retrying</artifactId>
</dependency>
<dependency>
+ <groupId>com.github.spotbugs</groupId>
+ <artifactId>spotbugs-annotations</artifactId>
+ </dependency>
+ <dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
@@ -57,7 +61,6 @@
<dependency>
<groupId>de.thetaphi</groupId>
<artifactId>forbiddenapis</artifactId>
- <version>2.3</version>
</dependency>
<dependency>
<groupId>io.dropwizard.metrics</groupId>
@@ -155,10 +158,6 @@
<finalName>wikidata-query-tools-${project.version}</finalName>
<plugins>
<plugin>
- <groupId>com.carrotsearch.randomizedtesting</groupId>
- <artifactId>junit4-maven-plugin</artifactId>
- </plugin>
- <plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
@@ -174,10 +173,6 @@
</configuration>
</execution>
</executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -210,15 +205,14 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-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-source-plugin</artifactId>
+ <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>
<plugin>
<groupId>org.codehaus.mojo</groupId>
--
To view, visit https://gerrit.wikimedia.org/r/383791
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia6e475d3a86d070347fe5abe157e0881aaae2784
Gerrit-PatchSet: 15
Gerrit-Project: wikidata/query/rdf
Gerrit-Branch: master
Gerrit-Owner: Gehel <guillaume.leder...@wikimedia.org>
Gerrit-Reviewer: Gehel <guillaume.leder...@wikimedia.org>
Gerrit-Reviewer: Smalyshev <smalys...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
