HBASE-12355 Update maven plugins
Conflicts: hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/QuotaCache.java hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogSplitter.java
This commit is contained in:
parent
e79572fa1c
commit
6f4ae948ac
@ -52,6 +52,7 @@
|
|||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-surefire-plugin</artifactId>
|
<artifactId>maven-surefire-plugin</artifactId>
|
||||||
<executions>
|
<executions>
|
||||||
<execution>
|
<execution>
|
||||||
|
@ -51,7 +51,7 @@ public class JMXListener implements Coprocessor {
|
|||||||
public static final Log LOG = LogFactory.getLog(JMXListener.class);
|
public static final Log LOG = LogFactory.getLog(JMXListener.class);
|
||||||
public static final String RMI_REGISTRY_PORT_CONF_KEY = ".rmi.registry.port";
|
public static final String RMI_REGISTRY_PORT_CONF_KEY = ".rmi.registry.port";
|
||||||
public static final String RMI_CONNECTOR_PORT_CONF_KEY = ".rmi.connector.port";
|
public static final String RMI_CONNECTOR_PORT_CONF_KEY = ".rmi.connector.port";
|
||||||
public static int defRMIRegistryPort = 10102;
|
public static final int defRMIRegistryPort = 10102;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* workaround for HBASE-11146
|
* workaround for HBASE-11146
|
||||||
|
@ -98,8 +98,6 @@ public class ZKSplitLogManagerCoordination extends ZooKeeperListener implements
|
|||||||
|
|
||||||
SplitLogManagerDetails details;
|
SplitLogManagerDetails details;
|
||||||
|
|
||||||
private final Stoppable stopper = null;
|
|
||||||
|
|
||||||
// When lastRecoveringNodeCreationTime is older than the following threshold, we'll check
|
// When lastRecoveringNodeCreationTime is older than the following threshold, we'll check
|
||||||
// whether to GC stale recovering znodes
|
// whether to GC stale recovering znodes
|
||||||
private volatile long lastRecoveringNodeCreationTime = 0;
|
private volatile long lastRecoveringNodeCreationTime = 0;
|
||||||
@ -669,7 +667,7 @@ public class ZKSplitLogManagerCoordination extends ZooKeeperListener implements
|
|||||||
} catch (InterruptedException e) {
|
} catch (InterruptedException e) {
|
||||||
throw new InterruptedIOException();
|
throw new InterruptedIOException();
|
||||||
}
|
}
|
||||||
} while ((--retries) > 0 && (!this.stopper.isStopped()));
|
} while ((--retries) > 0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -146,7 +146,7 @@ import com.google.protobuf.TextFormat;
|
|||||||
* and keep taking while the server is up.
|
* and keep taking while the server is up.
|
||||||
*
|
*
|
||||||
* CallRunner#run executes the call. When done, asks the included Call to put itself on new
|
* CallRunner#run executes the call. When done, asks the included Call to put itself on new
|
||||||
* queue for {@link Responder} to pull from and return result to client.
|
* queue for Responder to pull from and return result to client.
|
||||||
*
|
*
|
||||||
* @see RpcClient
|
* @see RpcClient
|
||||||
*/
|
*/
|
||||||
|
@ -524,7 +524,7 @@ public abstract class BaseLoadBalancer implements LoadBalancer {
|
|||||||
|
|
||||||
@edu.umd.cs.findbugs.annotations.SuppressWarnings(value="NM_FIELD_NAMING_CONVENTION",
|
@edu.umd.cs.findbugs.annotations.SuppressWarnings(value="NM_FIELD_NAMING_CONVENTION",
|
||||||
justification="Mistake. Too disruptive to change now")
|
justification="Mistake. Too disruptive to change now")
|
||||||
public static Action NullAction = new Action(Type.NULL);
|
public static final Action NullAction = new Action(Type.NULL);
|
||||||
|
|
||||||
public void doAction(Action action) {
|
public void doAction(Action action) {
|
||||||
switch (action.type) {
|
switch (action.type) {
|
||||||
|
@ -50,21 +50,15 @@ public class DelimitedKeyPrefixRegionSplitPolicy extends IncreasingToUpperBoundR
|
|||||||
@Override
|
@Override
|
||||||
protected void configureForRegion(HRegion region) {
|
protected void configureForRegion(HRegion region) {
|
||||||
super.configureForRegion(region);
|
super.configureForRegion(region);
|
||||||
if (region != null) {
|
|
||||||
|
|
||||||
// read the prefix length from the table descriptor
|
// read the prefix length from the table descriptor
|
||||||
String delimiterString = region.getTableDesc().getValue(
|
String delimiterString = region.getTableDesc().getValue(DELIMITER_KEY);
|
||||||
DELIMITER_KEY);
|
|
||||||
if (delimiterString == null || delimiterString.length() == 0) {
|
if (delimiterString == null || delimiterString.length() == 0) {
|
||||||
LOG.error(DELIMITER_KEY + " not specified for table "
|
LOG.error(DELIMITER_KEY + " not specified for table " + region.getTableDesc().getTableName() +
|
||||||
+ region.getTableDesc().getTableName()
|
". Using default RegionSplitPolicy");
|
||||||
+ ". Using default RegionSplitPolicy");
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
delimiter = Bytes.toBytes(delimiterString);
|
delimiter = Bytes.toBytes(delimiterString);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected byte[] getSplitPoint() {
|
protected byte[] getSplitPoint() {
|
||||||
|
@ -43,7 +43,6 @@ public class KeyPrefixRegionSplitPolicy extends IncreasingToUpperBoundRegionSpli
|
|||||||
@Override
|
@Override
|
||||||
protected void configureForRegion(HRegion region) {
|
protected void configureForRegion(HRegion region) {
|
||||||
super.configureForRegion(region);
|
super.configureForRegion(region);
|
||||||
if (region != null) {
|
|
||||||
prefixLength = 0;
|
prefixLength = 0;
|
||||||
|
|
||||||
// read the prefix length from the table descriptor
|
// read the prefix length from the table descriptor
|
||||||
@ -74,7 +73,6 @@ public class KeyPrefixRegionSplitPolicy extends IncreasingToUpperBoundRegionSpli
|
|||||||
+ prefixLengthString + ". Using default RegionSplitPolicy");
|
+ prefixLengthString + ". Using default RegionSplitPolicy");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected byte[] getSplitPoint() {
|
protected byte[] getSplitPoint() {
|
||||||
|
@ -1286,7 +1286,7 @@ public class AccessController extends BaseMasterAndRegionObserver
|
|||||||
ourFilter = new FilterList(FilterList.Operator.MUST_PASS_ALL,
|
ourFilter = new FilterList(FilterList.Operator.MUST_PASS_ALL,
|
||||||
Lists.newArrayList(ourFilter, filter));
|
Lists.newArrayList(ourFilter, filter));
|
||||||
}
|
}
|
||||||
authResult.setAllowed(true);;
|
authResult.setAllowed(true);
|
||||||
authResult.setReason("Access allowed with filter");
|
authResult.setReason("Access allowed with filter");
|
||||||
switch (opType) {
|
switch (opType) {
|
||||||
case GET:
|
case GET:
|
||||||
@ -1312,7 +1312,7 @@ public class AccessController extends BaseMasterAndRegionObserver
|
|||||||
ourFilter = new FilterList(FilterList.Operator.MUST_PASS_ALL,
|
ourFilter = new FilterList(FilterList.Operator.MUST_PASS_ALL,
|
||||||
Lists.newArrayList(ourFilter, filter));
|
Lists.newArrayList(ourFilter, filter));
|
||||||
}
|
}
|
||||||
authResult.setAllowed(true);;
|
authResult.setAllowed(true);
|
||||||
authResult.setReason("Access allowed with filter");
|
authResult.setReason("Access allowed with filter");
|
||||||
switch (opType) {
|
switch (opType) {
|
||||||
case GET:
|
case GET:
|
||||||
|
@ -127,7 +127,7 @@ public class CompressionTest {
|
|||||||
// Write any-old Cell...
|
// Write any-old Cell...
|
||||||
final byte [] rowKey = Bytes.toBytes("compressiontestkey");
|
final byte [] rowKey = Bytes.toBytes("compressiontestkey");
|
||||||
Cell c = CellUtil.createCell(rowKey, Bytes.toBytes("compressiontestval"));
|
Cell c = CellUtil.createCell(rowKey, Bytes.toBytes("compressiontestval"));
|
||||||
writer.append(c);;
|
writer.append(c);
|
||||||
writer.appendFileInfo(Bytes.toBytes("compressioninfokey"), Bytes.toBytes("compressioninfoval"));
|
writer.appendFileInfo(Bytes.toBytes("compressioninfokey"), Bytes.toBytes("compressioninfoval"));
|
||||||
writer.close();
|
writer.close();
|
||||||
Cell cc = null;
|
Cell cc = null;
|
||||||
|
@ -76,7 +76,6 @@ public class MultiHConnection {
|
|||||||
*/
|
*/
|
||||||
public void close() {
|
public void close() {
|
||||||
synchronized (hConnectionsLock) {
|
synchronized (hConnectionsLock) {
|
||||||
if (hConnections != null) {
|
|
||||||
if (hConnections != null) {
|
if (hConnections != null) {
|
||||||
for (Connection conn : hConnections) {
|
for (Connection conn : hConnections) {
|
||||||
if (conn != null) {
|
if (conn != null) {
|
||||||
@ -92,7 +91,6 @@ public class MultiHConnection {
|
|||||||
hConnections = null;
|
hConnections = null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
if (this.batchPool != null && !this.batchPool.isShutdown()) {
|
if (this.batchPool != null && !this.batchPool.isShutdown()) {
|
||||||
this.batchPool.shutdown();
|
this.batchPool.shutdown();
|
||||||
try {
|
try {
|
||||||
|
@ -71,6 +71,15 @@
|
|||||||
</goals>
|
</goals>
|
||||||
<configuration>
|
<configuration>
|
||||||
<skip>true</skip>
|
<skip>true</skip>
|
||||||
|
<properties>
|
||||||
|
<property>
|
||||||
|
<name>listener</name>
|
||||||
|
<value>org.apache.hadoop.hbase.ServerResourceCheckerJUnitListener</value>
|
||||||
|
</property>
|
||||||
|
</properties>
|
||||||
|
<systemPropertyVariables>
|
||||||
|
<test.build.webapps>target/test-classes/webapps</test.build.webapps>
|
||||||
|
</systemPropertyVariables>
|
||||||
</configuration>
|
</configuration>
|
||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
|
29
pom.xml
29
pom.xml
@ -467,16 +467,6 @@
|
|||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-release-plugin</artifactId>
|
<artifactId>maven-release-plugin</artifactId>
|
||||||
<version>2.4.1</version>
|
|
||||||
<!--Making a release I've been using mvn 3.0 and specifying the apache-release
|
|
||||||
profile on the command line as follows:
|
|
||||||
|
|
||||||
$ ~/bin/mvn/bin/mvn -Papache-release release:perform
|
|
||||||
|
|
||||||
I've also been kiling the release:prepare step mid-way to check the
|
|
||||||
release.properties it generates at the top-level. Sometimes it refers
|
|
||||||
to HEAD rather than to the svn branch.
|
|
||||||
-->
|
|
||||||
<configuration>
|
<configuration>
|
||||||
<!--You need this profile. It'll sign your artifacts.
|
<!--You need this profile. It'll sign your artifacts.
|
||||||
I'm not sure if this config. actually works though.
|
I'm not sure if this config. actually works though.
|
||||||
@ -491,6 +481,7 @@
|
|||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-compiler-plugin</artifactId>
|
<artifactId>maven-compiler-plugin</artifactId>
|
||||||
<version>2.5.1</version>
|
<version>2.5.1</version>
|
||||||
<configuration>
|
<configuration>
|
||||||
@ -503,6 +494,7 @@
|
|||||||
</plugin>
|
</plugin>
|
||||||
<!-- Test oriented plugins -->
|
<!-- Test oriented plugins -->
|
||||||
<plugin>
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-surefire-plugin</artifactId>
|
<artifactId>maven-surefire-plugin</artifactId>
|
||||||
<version>${surefire.version}</version>
|
<version>${surefire.version}</version>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
@ -548,10 +540,12 @@
|
|||||||
</executions>
|
</executions>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-surefire-report-plugin</artifactId>
|
<artifactId>maven-surefire-report-plugin</artifactId>
|
||||||
<version>${surefire.version}</version>
|
<version>${surefire.version}</version>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-clean-plugin</artifactId>
|
<artifactId>maven-clean-plugin</artifactId>
|
||||||
<configuration>
|
<configuration>
|
||||||
<filesets>
|
<filesets>
|
||||||
@ -566,7 +560,8 @@
|
|||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.codehaus.mojo</groupId>
|
<groupId>org.codehaus.mojo</groupId>
|
||||||
<artifactId>findbugs-maven-plugin</artifactId>
|
<artifactId>findbugs-maven-plugin</artifactId>
|
||||||
<version>${findbugs-maven-plugin.version}</version>
|
<version>3.0.0</version>
|
||||||
|
<!--NOTE: Findbugs 3.0.0 requires jdk7-->
|
||||||
<configuration>
|
<configuration>
|
||||||
<excludeFilterFile>${project.basedir}/../dev-support/findbugs-exclude.xml</excludeFilterFile>
|
<excludeFilterFile>${project.basedir}/../dev-support/findbugs-exclude.xml</excludeFilterFile>
|
||||||
<findbugsXmlOutput>true</findbugsXmlOutput>
|
<findbugsXmlOutput>true</findbugsXmlOutput>
|
||||||
@ -577,7 +572,7 @@
|
|||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.codehaus.mojo</groupId>
|
<groupId>org.codehaus.mojo</groupId>
|
||||||
<artifactId>build-helper-maven-plugin</artifactId>
|
<artifactId>build-helper-maven-plugin</artifactId>
|
||||||
<version>1.5</version>
|
<version>1.9.1</version>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
<artifactId>maven-antrun-plugin</artifactId>
|
<artifactId>maven-antrun-plugin</artifactId>
|
||||||
@ -633,7 +628,7 @@
|
|||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-eclipse-plugin</artifactId>
|
<artifactId>maven-eclipse-plugin</artifactId>
|
||||||
<version>2.8</version>
|
<version>2.9</version>
|
||||||
</plugin>
|
</plugin>
|
||||||
<!--This plugin's configuration is used to store Eclipse m2e settings only. It
|
<!--This plugin's configuration is used to store Eclipse m2e settings only. It
|
||||||
has no influence on the Maven build itself. m2e does not provide any safeguards against
|
has no influence on the Maven build itself. m2e does not provide any safeguards against
|
||||||
@ -650,7 +645,7 @@
|
|||||||
<!-- excludes are inherited -->
|
<!-- excludes are inherited -->
|
||||||
<groupId>org.apache.rat</groupId>
|
<groupId>org.apache.rat</groupId>
|
||||||
<artifactId>apache-rat-plugin</artifactId>
|
<artifactId>apache-rat-plugin</artifactId>
|
||||||
<version>0.8</version>
|
<version>0.11</version>
|
||||||
<configuration>
|
<configuration>
|
||||||
<excludes>
|
<excludes>
|
||||||
<exclude>**/*.versionsBackup</exclude>
|
<exclude>**/*.versionsBackup</exclude>
|
||||||
@ -855,7 +850,6 @@
|
|||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-resources-plugin</artifactId>
|
<artifactId>maven-resources-plugin</artifactId>
|
||||||
<version>${maven.resources.plugin.version}</version>
|
|
||||||
<!--$NO-MVN-MAN-VER$ -->
|
<!--$NO-MVN-MAN-VER$ -->
|
||||||
<inherited>false</inherited>
|
<inherited>false</inherited>
|
||||||
<executions>
|
<executions>
|
||||||
@ -903,7 +897,7 @@
|
|||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-site-plugin</artifactId>
|
<artifactId>maven-site-plugin</artifactId>
|
||||||
<version>${maven.site.version}</version>
|
<version>3.4</version>
|
||||||
<inherited>false</inherited>
|
<inherited>false</inherited>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
@ -995,11 +989,8 @@
|
|||||||
<maven.assembly.version>2.4</maven.assembly.version>
|
<maven.assembly.version>2.4</maven.assembly.version>
|
||||||
<maven.antrun.version>1.6</maven.antrun.version>
|
<maven.antrun.version>1.6</maven.antrun.version>
|
||||||
<jamon.plugin.version>2.3.4</jamon.plugin.version>
|
<jamon.plugin.version>2.3.4</jamon.plugin.version>
|
||||||
<findbugs-maven-plugin.version>2.5.2</findbugs-maven-plugin.version>
|
|
||||||
<findbugs-annotations>1.3.9-1</findbugs-annotations>
|
<findbugs-annotations>1.3.9-1</findbugs-annotations>
|
||||||
<maven.site.version>3.3</maven.site.version>
|
|
||||||
<javadoc.version>2.9</javadoc.version>
|
<javadoc.version>2.9</javadoc.version>
|
||||||
<maven.resources.plugin.version>2.6</maven.resources.plugin.version>
|
|
||||||
<!-- General Packaging -->
|
<!-- General Packaging -->
|
||||||
<package.prefix>/usr</package.prefix>
|
<package.prefix>/usr</package.prefix>
|
||||||
<package.conf.dir>/etc/hbase</package.conf.dir>
|
<package.conf.dir>/etc/hbase</package.conf.dir>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user